summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-inst/makefile5
-rw-r--r--apt-pkg/deb/dpkgpm.cc3
-rw-r--r--apt-pkg/init.h2
-rw-r--r--buildlib/library.mak14
-rw-r--r--buildlib/libversion.mak7
-rw-r--r--debian/apt.cron.daily6
-rw-r--r--debian/changelog54
-rwxr-xr-xdebian/rules14
-rw-r--r--doc/apt-ftparchive.1.xml6
-rw-r--r--doc/apt-get.8.xml6
-rw-r--r--doc/apt.conf.5.xml15
-rw-r--r--doc/de/addendum/debiandoc_de.add6
-rw-r--r--doc/examples/configure-index34
-rw-r--r--doc/po/apt-doc.pot1688
-rw-r--r--doc/po/de.po1951
-rw-r--r--doc/po/es.po2
-rw-r--r--doc/po/fr.po2123
-rw-r--r--doc/po/it.po2
-rw-r--r--doc/po/ja.po2318
-rw-r--r--doc/po/pl.po2
-rw-r--r--doc/po/pt_BR.po2
-rw-r--r--doc/sources.list.5.xml4
-rw-r--r--ftparchive/apt-ftparchive.cc4
-rw-r--r--ftparchive/cachedb.cc6
-rw-r--r--ftparchive/contents.cc2
-rw-r--r--ftparchive/multicompress.cc2
-rw-r--r--ftparchive/writer.cc2
-rw-r--r--methods/connect.cc1
-rw-r--r--methods/http.cc3
-rw-r--r--methods/https.cc88
-rw-r--r--methods/rred.cc648
-rw-r--r--po/apt-all.pot212
32 files changed, 7543 insertions, 1689 deletions
diff --git a/apt-inst/makefile b/apt-inst/makefile
index c0ff3d886..abc8c3fd9 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -9,9 +9,12 @@ HEADER_TARGETDIRS = apt-pkg
# Bring in the default rules
include ../buildlib/defaults.mak
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak
+
# The library name
LIBRARY=apt-inst
-MAJOR=1.2
+MAJOR=1.1
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
APT_DOMAIN:=libapt-inst$(MAJOR)
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 4b118bc14..88098c379 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -937,7 +937,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
const char *s = _("Can not write log, openpty() "
"failed (/dev/pts not mounted?)\n");
fprintf(stderr, "%s",s);
- fprintf(term_out, "%s",s);
+ if(term_out)
+ fprintf(term_out, "%s",s);
master = slave = -1;
} else {
struct termios rtt;
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index b3e4b147f..f0757f644 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -22,7 +22,7 @@
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 9
+#define APT_PKG_MINOR 8
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
diff --git a/buildlib/library.mak b/buildlib/library.mak
index 029e87463..2a4bb782a 100644
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -16,11 +16,11 @@
# See defaults.mak for information about LOCAL
# Some local definitions
-LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR)
+LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
$(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE)))))
$(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE)))))
$(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS))
-$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR)
+$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
$(LOCAL)-SLIBS := $(SLIBS)
$(LOCAL)-LIBRARY := $(LIBRARY)
@@ -29,7 +29,7 @@ include $(PODOMAIN_H)
# Install the command hooks
headers: $($(LOCAL)-HEADERS)
-library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR)
+library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
clean: clean/$(LOCAL)
veryclean: veryclean/$(LOCAL)
@@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL)
-rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so*
# Build rules for the two symlinks
-.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
-$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
+.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
+$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
ln -sf $(<F) $@
-$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
+$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
ln -sf $(<F) $@
# The binary build rule
-$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
+$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
-rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null
echo Building shared library $@
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak
index 796c956e7..26ca86ced 100644
--- a/buildlib/libversion.mak
+++ b/buildlib/libversion.mak
@@ -12,3 +12,10 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in
# The versionnumber is extracted from apt-inst/makefile - see also there.
LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
+
+# FIXME: In previous releases this lovely variable includes
+# the detected libc and libdc++ version. As this is bogus we
+# want to drop this, but this a ABI break.
+# And we don't want to do this now. So we hardcode a value here,
+# and drop it later on (hopefully as fast as possible).
+LIBEXT=-libc6.9-6
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index b6099ee75..e59b05ee4 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -401,12 +401,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv
Debdelta=1
eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta)
-# check if we actually have to do anything
+# check if we actually have to do anything that requires locking the cache
if [ $UpdateInterval -eq 0 ] &&
[ $DownloadUpgradeableInterval -eq 0 ] &&
[ $UnattendedUpgradeInterval -eq 0 ] &&
[ $BackupArchiveInterval -eq 0 ] &&
[ $AutocleanInterval -eq 0 ]; then
+
+ # check cache size
+ check_size_constraints
+
exit 0
fi
diff --git a/debian/changelog b/debian/changelog
index c75ea227e..eb50b4c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-apt (0.7.25) UNRELEASED; urgency=low
+apt (0.7.25.1) UNRELEASED; urgency=low
+
+ * merged lp:~mvo/apt/history
+ - this writes a /var/log/apt/history tagfile that contains details
+ from the transaction (complements term.log)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100
+
+apt (0.7.25) unstable; urgency=low
[ Christian Perrier ]
* Fix apt-ftparchive(1) wrt description of the "-o" option.
@@ -13,8 +21,6 @@ apt (0.7.25) UNRELEASED; urgency=low
Closes: #548571
* German translation update by Holger Wansing
Closes: #551534
- * German translation of manpages by Chris Leick
- Closes: #552606
* Italian translation update by Milo Casagrande
Closes: #555797
* Simplified Chinese translation update by Aron Xu
@@ -36,6 +42,10 @@ apt (0.7.25) UNRELEASED; urgency=low
(thanks also to Jussi Hakala and Julian Andres Klode)
* apt-pkg/deb/dpkgpm.cc:
- add "purge" to list of known actions
+ * apt-pkg/init.h:
+ - add compatibility with old ABI name until the next ABI break
+ * merge segfault fix from Mario Sanchez Prada, many thanks
+ (closes: #561109)
[ Brian Murray ]
* apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
@@ -54,18 +64,21 @@ apt (0.7.25) UNRELEASED; urgency=low
* doc/po4a.conf: activate translation of guide.sgml and offline.sgml
* doc/apt.conf.5.xml:
- provide a few more details about APT::Immediate-Configure
+ - briefly document the behaviour of the new https options
* doc/sources.list.5.xml:
- add note about additional apt-transport-methods
* doc/apt-mark.8.xml:
- correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
* cmdline/apt-get.cc:
- - source should displays his final pkg pick (Closes: #249383, #550952)
+ - source should display his final pkg pick (Closes: #249383, #550952)
- source doesn't need the complete version for match (Closes: #245250)
- source ignores versions/releases if not available (Closes: #377424)
- only warn if (free) space overflows (Closes: #522238)
- add --debian-only as alias for --diff-only
* methods/connect.cc:
- display also strerror of "wicked" getaddrinfo errors
+ - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
+ in response to Bernhard R. Link, thanks! (Closes: #505020)
* buildlib/configure.mak, buildlib/config.{sub,guess}:
- remove (outdated) config.{sub,guess} and use the ones provided
by the new added build-dependency autotools-dev instead
@@ -79,21 +92,42 @@ apt (0.7.25) UNRELEASED; urgency=low
- bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
- fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
- * cmdline/apt-mark:
- - print an error if a new state file can't be created,
- thanks Carl Chenet! (Closes: #521289)
- - print an error and exit if python-apt is not installed,
- thanks Carl Chenet! (Closes: #521284)
* ftparchive/writer.{cc,h}:
- add APT::FTPArchive::LongDescription to be able to disable them
* apt-pkg/deb/debsrcrecords.cc:
- use "diff" filetype for .debian.tar.* files (Closes: #554898)
+ * methods/rred.cc:
+ - rewrite to be able to handle even big patch files
+ - adopt optional mmap+iovec patch from Morten Hustveit
+ (Closes: #463354) which should speed up a bit. Thanks!
+ * methods/http{,s}.cc
+ - add config setting for User-Agent to the Acquire group,
+ thanks Timothy J. Miller! (Closes: #355782)
+ - add https options which default to http ones (Closes: #557085)
+ * debian/apt.cron.daily:
+ - check cache size even if we do nothing else otherwise, thanks
+ Francesco Poli for patch(s) and patience! (Closes: #459344)
+ * ftparchive/*:
+ - fix a few typos in strings, comments and manpage,
+ thanks Karl Goetz! (Closes: #558757)
+
+ [ Carl Chenet ]
+ * cmdline/apt-mark:
+ - print an error if a new state file can't be created
+ (Closes: #521289) and
+ - exit nicely if python-apt is not installed (Closes: #521284)
[ Chris Leick ]
+ * doc/de: German translation of manpages (Closes: #552606)
* doc/ various manpages:
- correct various errors, typos and oddities (Closes: #552535)
* doc/apt-secure.8.xml:
- replace literal with emphasis tags in Archive configuration
+ * doc/apt-ftparchive.1.xml:
+ - remove informalexample tag which hides the programlisting
+ * doc/apt-get.8.xml:
+ - change equivalent "for" to "to the" (purge command)
+ - clarify --fix-broken sentence about specifying packages
[ Eugene V. Lyubimkin ]
* apt-pkg/contib/strutl.h
@@ -113,7 +147,7 @@ apt (0.7.25) UNRELEASED; urgency=low
* debian/apt.conf.autoremove:
- Add kfreebsd-image-* to the list (Closes: #558803)
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200
+ -- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100
apt (0.7.24) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index f69c0cffb..d01b57cd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
include buildlib/libversion.mak
# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR)
+LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR)
+LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR)
debian/shlibs.local: apt-pkg/makefile
# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
# one for the rest of the packages. This ensures that each package gets
# the right overrides..
rm -rf $@ $@.apt $@.apt-utils
- echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt
+ echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt
- echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
- echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils
+ echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
+ echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
- echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
- echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
+ echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
+ echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
build: build/build-stamp
build-doc: build/build-doc-stamp
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index d47df957a..c56ff235a 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -285,7 +285,7 @@
<varlistentry><term>Sources</term>
<listitem><para>
- Sets the output Packages file. Defaults to
+ Sets the output Sources file. Defaults to
<filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
</varlistentry>
@@ -350,11 +350,11 @@
<para>
When processing a <literal>Tree</literal> section <command>apt-ftparchive</command>
performs an operation similar to:
-<informalexample><programlisting>
+ <programlisting>
for i in Sections do
for j in Architectures do
Generate for DIST=scope SECTION=i ARCH=j
-</programlisting></informalexample></para>
+ </programlisting></para>
<variablelist>
<varlistentry><term>Sections</term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index d3c3772bd..3d22f262c 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -333,8 +333,8 @@
<varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
<listitem><para>Fix; attempt to correct a system with broken dependencies in
place. This option, when used with install/remove, can omit any packages
- to permit APT to deduce a likely solution. Any Package that are specified
- must completely correct the problem. The option is sometimes necessary when
+ to permit APT to deduce a likely solution. If packages are specified,
+ these have to completely correct the problem. The option is sometimes necessary when
running APT for the first time; APT itself does not allow broken package
dependencies to exist on a system. It is possible that a system's
dependency structure can be so corrupt as to require manual intervention
@@ -466,7 +466,7 @@
<varlistentry><term><option>--purge</option></term>
<listitem><para>Use purge instead of remove for anything that would be removed.
An asterisk ("*") will be displayed next to packages which are
- scheduled to be purged. <option>remove --purge</option> is equivalent for
+ scheduled to be purged. <option>remove --purge</option> is equivalent to the
<option>purge</option> command.
Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
</varlistentry>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e2db9defb..d7ad51cfb 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -275,13 +275,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal>
which accepts integer values in kilobyte. The default value is 0 which deactivates
the limit and tries uses as much as possible of the bandwidth (Note that this option implicit
- deactivates the download from multiple servers at the same time.)</para></listitem>
+ deactivates the download from multiple servers at the same time.)</para>
+
+ <para><literal>Acquire::http::User-Agent</literal> can be used to set a different
+ User-Agent for the http download method as some proxies allow access for clients
+ only if the client uses a known identifier.</para>
+ </listitem>
</varlistentry>
<varlistentry><term>https</term>
- <listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for
- <literal>http</literal> method.
- <literal>Pipeline-Depth</literal> option is not supported yet.</para>
+ <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and
+ proxy options are the same as for <literal>http</literal> method and will also
+ default to the options from the <literal>http</literal> method if they are not
+ explicitly set for https. <literal>Pipeline-Depth</literal> option is not
+ supported yet.</para>
<para><literal>CaInfo</literal> suboption specifies place of file that
holds info about trusted certificates.
diff --git a/doc/de/addendum/debiandoc_de.add b/doc/de/addendum/debiandoc_de.add
new file mode 100644
index 000000000..2332878a6
--- /dev/null
+++ b/doc/de/addendum/debiandoc_de.add
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>Übersetzung</title>
+ <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
+ in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
+ </refsect1>
+
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index eaea6511c..1e9946e1b 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -191,19 +191,37 @@ Acquire
Max-Age "86400"; // 1 Day age on index files
No-Store "false"; // Prevent the cache from storing archives
Dl-Limit "7"; // 7Kb/sec maximum download rate
+ User-Agent "Debian APT-HTTP/1.3";
};
- // HTTPS method configuration:
- // - uses the http proxy config
- // - uses the http cache-control values
- // - uses the http Dl-Limit values
- https
+
+
+ // HTTPS method configuration: uses the http
+ // - proxy config
+ // - cache-control values
+ // - Dl-Limit, Timout, ... values
+ // if not set explicit for https
+ //
+ // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz
+ // for more examples
+ https
{
Verify-Peer "false";
SslCert "/etc/apt/some.pem";
- CaPath "/etc/ssl/certs";
- Verify-Host" "true";
- AllowRedirect "true";
+ CaPath "/etc/ssl/certs";
+ Verify-Host" "true";
+ AllowRedirect "true";
+
+ Timeout "120";
+ AllowRedirect "true";
+
+ // Cache Control. Note these do not work with Squid 2.0.2
+ No-Cache "false";
+ Max-Age "86400"; // 1 Day age on index files
+ No-Store "false"; // Prevent the cache from storing archives
+ Dl-Limit "7"; // 7Kb/sec maximum download rate
+
+ User-Agent "Debian APT-CURL/1.0";
};
ftp
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e4736029f..46febf8ca 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-12-01 19:13+0100\n"
+"POT-Creation-Date: 2009-11-27 00:18+0100\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"
@@ -284,7 +284,7 @@ msgstr ""
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -772,7 +772,7 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
"February 2004</date>"
@@ -983,7 +983,7 @@ msgstr ""
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be in evidence if a full distribution is not accessed, or if a "
+"packages may be an evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1218,7 +1218,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
msgid "options"
msgstr ""
@@ -1411,12 +1411,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:973 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:1017 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
@@ -1426,7 +1426,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 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:979 apt_preferences.5.xml:622 sources.list.5.xml:221
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 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:1023 apt_preferences.5.xml:622 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1436,7 +1436,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1735,7 +1735,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -1809,7 +1809,7 @@ msgstr ""
#: apt-extracttemplates.1.xml:62
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts Configuration Item: "
+"config scripts. Configuration Item: "
"<literal>APT::ExtractTemplates::TempDir</literal>"
msgstr ""
@@ -1820,6 +1820,14 @@ msgid ""
"decimal 100 on error."
msgstr ""
+#. The last update date
+#. type: Content of: <refentry><refentryinfo>
+#: apt-ftparchive.1.xml:13
+msgid ""
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"August 2009</date>"
+msgstr ""
+
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
msgid "apt-ftparchive"
@@ -2027,8 +2035,8 @@ msgstr ""
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended to certain relative paths defined in later "
-"sections to produce a complete an absolute path."
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2680,13 +2688,28 @@ msgid ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:547
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+msgid ""
+"This configuration option defaults to \"<literal>true</literal>\" and should "
+"only be set to <literal>\"false\"</literal> if the Archive generated with "
+"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
+"that it is currently not possible to create these files with "
+"<command>apt-ftparchive</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462 sources.list.5.xml:181
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:567
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2695,14 +2718,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:563
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:577
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2716,8 +2739,8 @@ msgid ""
"November 2008</date>"
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:29
+#. type: <heading></heading>
+#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
msgid "apt-get"
msgstr ""
@@ -2792,8 +2815,8 @@ msgid ""
"advance."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:147
+#. type: <tag></tag>
+#: apt-get.8.xml:147 guide.sgml:121
msgid "upgrade"
msgstr ""
@@ -2829,8 +2852,8 @@ msgid ""
"removal of old and the installation of new packages)."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:170
+#. type: <tag></tag>
+#: apt-get.8.xml:170 guide.sgml:140
msgid "dist-upgrade"
msgstr ""
@@ -2848,8 +2871,8 @@ msgid ""
"for a mechanism for overriding the general settings for individual packages."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:183
+#. type: <tag></tag>
+#: apt-get.8.xml:183 guide.sgml:131
msgid "install"
msgstr ""
@@ -2977,7 +3000,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
msgid ""
-"If the <option>--compile</option> options is specified then the package will "
+"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -3195,8 +3218,8 @@ msgstr ""
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages with and empty set of square brackets meaning "
-"breaks that are of no consequence (rare)."
+"indicate broken packages and empty set of square brackets meaning breaks "
+"that are of no consequence (rare)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3812,8 +3835,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
msgid ""
-"<literal>showauto</literal> is used to print a list of manually installed "
-"packages with each package on a new line."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3938,7 +3961,7 @@ msgid ""
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. Its the archive maintainer responsibility to ensure that the "
+"maintainer. It's the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
@@ -3969,8 +3992,8 @@ msgid ""
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year and distributed through the "
-"FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year) and distributed through "
+"the FTP server. This key is also on the Debian keyring."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -4058,7 +4081,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
msgid ""
-"<literal>Create a toplevel Release file</literal>. if it does not exist "
+"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive "
"release</command> (provided in apt-utils)."
msgstr ""
@@ -4066,14 +4089,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
msgid ""
-"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs "
+"-o Release.gpg Release</command>."
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
msgid ""
-"<literal>Publish the key fingerprint</literal>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -4211,9 +4234,9 @@ msgstr ""
#: apt.conf.5.xml:50
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. option specification is given with a double colon "
+"functional groups. Option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. options do not inherit from "
+"within the APT tool group, for the Get tool. Options do not inherit from "
"their parent groups."
msgstr ""
@@ -4224,13 +4247,13 @@ msgid ""
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
"treated as comments (ignored), as well as all text between "
"<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments. "
-"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal> "
-"The trailing semicolon and the quotes are required. The value must be on one "
-"line, and there is no kind of string concatenation. It must not include "
-"inside quotes. The behavior of the backslash \"\\\" and escaped characters "
-"inside a value is undefined and it should not be used. An option name may "
-"include alphanumerical characters and the \"/-:._+\" characters. A new scope "
-"can be opened with curly braces, like:"
+"Each line is of the form <literal>APT::Get::Assume-Yes "
+"\"true\";</literal>. The trailing semicolon and the quotes are required. The "
+"value must be on one line, and there is no kind of string concatenation. It "
+"must not include inside quotes. The behavior of the backslash \"\\\" and "
+"escaped characters inside a value is undefined and it should not be used. An "
+"option name may include alphanumerical characters and the \"/-:._+\" "
+"characters. A new scope can be opened with curly braces, like:"
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -4408,20 +4431,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Disable Immediate Configuration; This dangerous option disables some of "
-"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-"necessary on some extremely slow single user systems but is very dangerous "
-"and may cause package install scripts to fail or worse. Use at your own "
-"risk."
+"Defaults to on which will cause APT to install essential and important "
+"packages as fast as possible in the install/upgrade operation. This is done "
+"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
+"does treat an important package in the same way as an extra package: Between "
+"the unpacking of the important package A and his configuration can then be "
+"many other unpack or configuration calls, e.g. for package B which has no "
+"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
+"script of package B generates an error) which results in a system state in "
+"which package A is unpacked but unconfigured - each package depending on A "
+"is now no longer guaranteed to work as their dependency on A is not longer "
+"satisfied. The immediate configuration marker is also applied to all "
+"dependencies which can generate a problem if the dependencies e.g. form a "
+"circle as a dependency with the immediate flag is comparable with a "
+"Pre-Dependency. So in theory it is possible that APT encounters a situation "
+"in which it is unable to perform immediate configuration, error out and "
+"refers to this option so the user can deactivate the immediate configuration "
+"temporary to be able to perform an install/upgrade again. Note the use of "
+"the word \"theory\" here as this problem was only encountered by now in real "
+"world a few times in non-stable distribution versions and caused by wrong "
+"dependencies of the package in question or by a system in an already broken "
+"state, so you should not blindly disable this option as the mentioned "
+"scenario above is not the only problem immediate configuration can help to "
+"prevent in the first place. Before a big operation like "
+"<literal>dist-upgrade</literal> is run with this option disabled it should "
+"be tried to explicitly <literal>install</literal> the package APT is unable "
+"to configure immediately, but please make sure to report your problem also "
+"to your distribution and to the APT team with the buglink below so they can "
+"work on improving or correcting the upgrade process."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:181
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:182
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a "
@@ -4432,87 +4478,87 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:190
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:191
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:195
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:196
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:199
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:200
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:189
+#: apt.conf.5.xml:204
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:205
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:194
+#: apt.conf.5.xml:209
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:210
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:216
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:221
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:222
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:227
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:213
+#: apt.conf.5.xml:228
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4522,36 +4568,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:235
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:236
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:240
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:226
+#: apt.conf.5.xml:241
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:230 sources.list.5.xml:139
+#: apt.conf.5.xml:245 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:246
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4563,7 +4609,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:239
+#: apt.conf.5.xml:254
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4577,7 +4623,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:249 apt.conf.5.xml:306
+#: apt.conf.5.xml:264 apt.conf.5.xml:328
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4585,10 +4631,10 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:252
+#: apt.conf.5.xml:267
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -4597,7 +4643,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:275
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4606,21 +4652,31 @@ msgid ""
"deactivates the download from multiple servers at the same time.)"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:266
+#: apt.conf.5.xml:286
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:287
msgid ""
-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:271
+#: apt.conf.5.xml:293
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4642,12 +4698,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:150
+#: apt.conf.5.xml:311 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:290
+#: apt.conf.5.xml:312
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4667,7 +4723,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:309
+#: apt.conf.5.xml:331
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4677,7 +4733,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:338
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4687,7 +4743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:321
+#: apt.conf.5.xml:343
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4697,18 +4753,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:328 sources.list.5.xml:132
+#: apt.conf.5.xml:350 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:356
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:351
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4721,12 +4777,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:361
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340
+#: apt.conf.5.xml:362
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4734,12 +4790,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:367
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:373
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4747,7 +4803,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:368
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4759,19 +4815,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:381
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:374
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4788,13 +4844,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:385
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:383
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4809,7 +4865,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:390
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4818,8 +4874,55 @@ msgid ""
"prefer uncompressed files to support the usage of local mirrors."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:396
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:397
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the "
+"Description-Translations. APT will try to display the first available "
+"Description for the Language which is listed at first. Languages can be "
+"defined with their short or long Languagecodes. Note that not all archives "
+"provide <filename>Translation</filename> files for every Language - "
+"especially the long Languagecodes are rare, so please inform you which ones "
+"are available before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:413
+#, no-wrap
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+msgid ""
+"The default list includes \"environment\" and "
+"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
+"will be replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used. To "
+"force apt to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a fitting "
+"<filename>Translation</filename> file. This can be used by the system "
+"administrator to let APT know that it should download also this files "
+"without actually use them if not the environment specifies this "
+"languages. So the following example configuration will result in the order "
+"\"en, de\" in an english and in \"de, en\" in a german localization. Note "
+"that \"fr\" is downloaded, but not used if APT is not used in a french "
+"localization, in such an environment the order would be \"fr, de, en\". "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:217
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4827,12 +4930,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:420
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:422
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4844,7 +4947,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:429
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4857,7 +4960,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:438
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4867,7 +4970,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:444
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4875,7 +4978,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:448
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -4887,7 +4990,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:456
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4900,12 +5003,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:469
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:471
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4913,12 +5016,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:475
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:476
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -4929,50 +5032,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:485
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:489
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:490
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:451
+#: apt.conf.5.xml:494
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:495
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:501
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:502
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:507
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4980,17 +5083,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:513
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4999,12 +5102,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:519
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:477
+#: apt.conf.5.xml:520
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5014,7 +5117,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:526
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5025,36 +5128,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:533
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:534
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:538
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:539
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:544
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:545
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 "
@@ -5069,7 +5172,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:560
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5079,7 +5182,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:554
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 "
@@ -5093,29 +5196,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:566
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:567
msgid ""
-"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"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 then this flag is present unless it is "
-"explicit called to do so in an extra call. Note that this option exists "
+"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 add these flag also to the unpack and remove calls."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:574
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:575
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5124,37 +5227,37 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next "
"option. \"<literal>no</literal>\" on the other hand will not configure "
-"anything and totally relay on dpkg for configuration (which will at the "
+"anything and totally rely on dpkg for configuration (which will at the "
"moment fail if a Pre-Depends is encountered). Setting this option to "
-"another than the all value will implicit activate also the next option per "
+"another than the all value will implicitly 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:542
+#: apt.conf.5.xml:585
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:586
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 the previous "
"option is not set to <literal>all</literal>, 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 could deactivate this option in all but the "
-"last run."
+"installer. In these sceneries you could deactivate this option in all but "
+"the last run."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:592
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:593
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5164,12 +5267,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:555
+#: apt.conf.5.xml:598
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:599
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by "
@@ -5181,12 +5284,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:606
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:614
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5198,7 +5301,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:607
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5212,12 +5315,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:627
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:628
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5226,12 +5329,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:636
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:638
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5242,7 +5345,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:649
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5250,7 +5353,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:657
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5258,7 +5361,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:623
+#: apt.conf.5.xml:666
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5268,110 +5371,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:631
+#: apt.conf.5.xml:674
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:641
+#: apt.conf.5.xml:684
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:689
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:693
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:700
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:704
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:711
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:715
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:722
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:726
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:733
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:737
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:701
+#: apt.conf.5.xml:744
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:748
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:712
+#: apt.conf.5.xml:755
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:758
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:765
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:768
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:732
+#: apt.conf.5.xml:775
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:778
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 "
@@ -5379,92 +5482,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:786
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:789
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:754
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:801
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:765
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:811
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:775
+#: apt.conf.5.xml:818
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:821
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:786
+#: apt.conf.5.xml:829
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:833
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:797
+#: apt.conf.5.xml:840
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:844
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:808
+#: apt.conf.5.xml:851
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:855
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:819
+#: apt.conf.5.xml:862
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:865
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5474,12 +5577,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:879
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5497,90 +5600,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:901
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:908
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:911
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:876
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:922
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:886
+#: apt.conf.5.xml:929
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:933
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:898
+#: apt.conf.5.xml:941
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:945
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:952
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:956
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:962
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:966
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:931
+#: apt.conf.5.xml:974
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:977
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 "
@@ -5588,32 +5691,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:985
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:989
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:968
+#: apt.conf.5.xml:1012
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:975
+#: apt.conf.5.xml:1019
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1024
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -6529,7 +6632,7 @@ msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is located in <filename>/etc/apt/sources.list</filename>"
+"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6539,7 +6642,7 @@ msgid ""
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -6575,7 +6678,7 @@ msgid ""
"<literal>stable</literal> <literal>unstable</literal> or "
"<literal>testing</literal> while component is one of <literal>main</literal> "
"<literal>contrib</literal> <literal>non-free</literal> or "
-"<literal>non-us</literal> The <literal>deb-src</literal> type describes a "
+"<literal>non-us</literal>. The <literal>deb-src</literal> type describes a "
"debian distribution's source code in the same form as the "
"<literal>deb</literal> type. A <literal>deb-src</literal> line is required "
"to fetch source indexes."
@@ -6585,7 +6688,7 @@ msgstr ""
#: sources.list.5.xml:73
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types are:"
+"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
@@ -6601,8 +6704,8 @@ msgid ""
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when only a particular sub-section of the "
-"archive denoted by the URI is of interest. If "
+"a slash (/). This is useful for when the case only a particular sub-section "
+"of the archive denoted by the URI is of interest. If "
"<literal>distribution</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
@@ -6690,7 +6793,7 @@ msgid ""
"variable <envar>http_proxy</envar> is set with the format "
"http://server:port/, the proxy server specified in <envar>http_proxy</envar> "
"will be used. Users of authenticated HTTP/1.1 proxies may use a string of "
-"the format http://user:pass@server:port/ Note that this is an insecure "
+"the format http://user:pass@server:port/. Note that this is an insecure "
"method of authentication."
msgstr ""
@@ -6739,6 +6842,25 @@ msgid ""
"file transfers from the remote."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:178
+msgid "more recongnizable URI types"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:180
+msgid ""
+"APT can be extended with more methods shipped in other optional packages "
+"which should follow the nameing scheme "
+"<literal>apt-transport-<replaceable>method</replaceable></literal>. The APT "
+"team e.g. maintain also the <literal>apt-transport-https</literal> package "
+"which provides access methods for https-URIs with features similiar to the "
+"http method, but other methods for using e.g. debtorrent are also available, "
+"see <citerefentry> "
+"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
+"<manvolnum>1</manvolnum></citerefentry>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
msgid ""
@@ -6747,91 +6869,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:194
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:196
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:198
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:187
+#: sources.list.5.xml:199
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:201
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:202
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:192
+#: sources.list.5.xml:204
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:206
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:208
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:210
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:212
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in "
-"<filename>sources.list</filename>. a single FTP session will be used for "
-"both resource lines."
+"well as the one in the previous example in <filename>sources.list</filename> "
+"a single FTP session will be used for both resource lines."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:216
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:218
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:220
#, no-wrap
msgid ""
"deb http://nonus.debian.org/debian-non-US stable/non-US main contrib "
@@ -6839,13 +6960,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:222
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under "
@@ -6857,6 +6978,1067 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:234
msgid "&apt-cache; &apt-conf;"
msgstr ""
+
+#. type: <title></title>
+#: guide.sgml:4
+msgid "APT User's Guide"
+msgstr ""
+
+#. type: <author></author>
+#: guide.sgml:6 offline.sgml:6
+msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+msgstr ""
+
+#. type: <version></version>
+#: guide.sgml:7
+msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: guide.sgml:11
+msgid ""
+"This document provides an overview of how to use the the APT package "
+"manager."
+msgstr ""
+
+#. type: <copyrightsummary></copyrightsummary>
+#: guide.sgml:15
+msgid "Copyright &copy; Jason Gunthorpe, 1998."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:21 offline.sgml:22
+msgid ""
+"\"APT\" and this document are free software; you can redistribute them "
+"and/or modify them under the terms of the GNU General Public License as "
+"published by the Free Software Foundation; either version 2 of the License, "
+"or (at your option) any later version."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:24 offline.sgml:25
+msgid ""
+"For more details, on Debian GNU/Linux systems, see the file "
+"/usr/share/common-licenses/GPL for the full license."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:32
+msgid "General"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:38
+msgid ""
+"The APT package currently contains two sections, the APT "
+"<prgn>dselect</prgn> method and the <prgn>apt-get</prgn> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:39
+msgid "Anatomy of the Package System"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:44
+msgid ""
+"The Debian packaging system has a large amount of information associated "
+"with each package to help assure that it integrates cleanly and easily into "
+"the system. The most prominent of its features is the dependency system."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:52
+msgid ""
+"The dependency system allows individual programs to make use of shared "
+"elements in the system such as libraries. It simplifies placing infrequently "
+"used portions of a program in separate packages to reduce the number of "
+"things the average user is required to install. Also, it allows for choices "
+"in mail transport agents, X servers and so on."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:57
+msgid ""
+"The first step to understanding the dependency system is to grasp the "
+"concept of a simple dependency. The meaning of a simple dependency is that a "
+"package requires another package to be installed at the same time to work "
+"properly."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:63
+msgid ""
+"For instance, mailcrypt is an emacs extension that aids in encrypting email "
+"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"simple dependency on GPG. Also, because it is an emacs extension it has a "
+"simple dependency on emacs, without emacs it is completely useless."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:73
+msgid ""
+"The other important dependency to understand is a conflicting dependency. It "
+"means that a package, when installed with another package, will not work and "
+"may possibly be extremely harmful to the system. As an example consider a "
+"mail transport agent such as sendmail, exim or qmail. It is not possible to "
+"have two mail transport agents installed because both need to listen to the "
+"network to receive mail. Attempting to install two will seriously damage the "
+"system so all mail transport agents have a conflicting dependency with all "
+"other mail transport agents."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:83
+msgid ""
+"As an added complication there is the possibility for a package to pretend "
+"to be another package. Consider that exim and sendmail for many intents are "
+"identical, they both deliver mail and understand a common interface. Hence, "
+"the package system has a way for them to declare that they are both "
+"mail-transport-agents. So, exim and sendmail both declare that they provide "
+"a mail-transport-agent and other packages that need a mail transport agent "
+"depend on mail-transport-agent. This can add a great deal of confusion when "
+"trying to manually fix packages."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:88
+msgid ""
+"At any given time a single dependency may be met by packages that are "
+"already installed or it may not be. APT attempts to help resolve dependency "
+"issues by providing a number of automatic algorithms that help in selecting "
+"packages for installation."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:102
+msgid ""
+"<prgn>apt-get</prgn> provides a simple way to install packages from the "
+"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
+"understand .deb files, it works with the package's proper name and can only "
+"install .deb archives from a <em>Source</em>."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:109
+msgid ""
+"The first <footnote><p>If you are using an http proxy server you must set "
+"the http_proxy environment variable first, see "
+"sources.list(5)</p></footnote> thing that should be done before using "
+"<prgn>apt-get</prgn> is to fetch the package lists from the <em>Sources</em> "
+"so that it knows what packages are available. This is done with <tt>apt-get "
+"update</tt>. For instance,"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:116
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p><taglist>
+#: guide.sgml:120
+msgid "Once updated there are several commands that can be used:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:131
+msgid ""
+"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
+"install a new package or remove an existing package, nor will it ever "
+"upgrade a package that might cause some other package to break. This can be "
+"used daily to relatively safely upgrade the system. Upgrade will list all of "
+"the packages that it could not upgrade, this usually means that they depend "
+"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
+"<tt>apt-get install</tt> can be used to force these packages to install."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:140
+msgid ""
+"Install is used to install packages by name. The package is automatically "
+"fetched and installed. This can be useful if you already know the name of "
+"the package to install and do not want to go into a GUI to select it. Any "
+"number of packages may be passed to install, they will all be "
+"fetched. Install automatically attempts to resolve dependency problems with "
+"the listed packages and will print a summary and ask for confirmation if "
+"anything other than its arguments are changed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:149
+msgid ""
+"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
+"releases of Debian. It uses a sophisticated algorithm to determine the best "
+"set of packages to install, upgrade and remove to get as much of the system "
+"to the newest release. In some situations it may be desired to use "
+"dist-upgrade rather than spend the time manually resolving dependencies in "
+"<prgn>dselect</prgn>. Once dist-upgrade has completed then "
+"<prgn>dselect</prgn> can be used to install any packages that may have been "
+"left out."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:152
+msgid ""
+"It is important to closely look at what dist-upgrade is going to do, its "
+"decisions may sometimes be quite surprising."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:163
+msgid ""
+"<prgn>apt-get</prgn> has several command line options that are detailed in "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"option is <tt>-d</tt> which does not install the fetched files. If the "
+"system has to download a large number of package it would be undesired to "
+"start installing them in case something goes wrong. When <tt>-d</tt> is used "
+"the downloaded archives can be installed by simply running the command that "
+"caused them to be downloaded again without <tt>-d</tt>."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:168
+msgid "DSelect"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:173
+msgid ""
+"The APT <prgn>dselect</prgn> method provides the complete APT system with "
+"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
+"to select the packages to be installed or removed and APT actually installs "
+"them."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:184
+msgid ""
+"To enable the APT method you need to to select [A]ccess in "
+"<prgn>dselect</prgn> and then choose the APT method. You will be prompted "
+"for a set of <em>Sources</em> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CDROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
+"combine them to form a complete set of packages. If you have a CDROM then it "
+"is a good idea to specify it first and then specify a mirror so that you "
+"have access to the latest bug fixes. APT will automatically use packages on "
+"your CDROM before downloading from the Internet."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:198
+#, no-wrap
+msgid ""
+" Set up a list of distribution source locations\n"
+"\t \n"
+" Please give the base URL of the debian distribution.\n"
+" The access schemes I know about are: http file\n"
+"\t \n"
+" For example:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:205
+msgid ""
+"The <em>Sources</em> setup starts by asking for the base of the Debian "
+"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
+"get."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:212
+#, no-wrap
+msgid ""
+" Please give the distribution tag to get or a path to the\n"
+" package file ending in a /. The distribution\n"
+" tags are typically something like: stable unstable testing non-US\n"
+" \n"
+" Distribution [stable]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:222
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<em>stable</em> refers to the latest released version and <em>unstable</em> "
+"refers to the developmental version. <em>non-US</em> is only available on "
+"some mirrors and refers to packages that contain encryption technology or "
+"other things that cannot be exported from the United States. Importing these "
+"packages into the US is legal however."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:228
+#, no-wrap
+msgid ""
+" Please give the components to get\n"
+" The components are typically something like: main contrib non-free\n"
+" \n"
+" Components [main contrib non-free]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:236
+msgid ""
+"The components list refers to the list of sub distributions to fetch. The "
+"distribution is split up based on software licenses, main being DFSG free "
+"packages while contrib and non-free contain things that have various "
+"restrictions placed on their use and distribution."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:240
+msgid ""
+"Any number of sources can be added, the setup script will continue to prompt "
+"until you have specified all that you want."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:247
+msgid ""
+"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+"available list by selecting [U]pdate from the menu. This is a super-set of "
+"<tt>apt-get update</tt> that makes the fetched information available to "
+"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
+"update</tt> has been run before."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:253
+msgid ""
+"You can then go on and make your selections using [S]elect and then perform "
+"the installation using [I]nstall. When using the APT method the [C]onfig and "
+"[R]emove commands have no meaning, the [I]nstall command performs both of "
+"them together."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:258
+msgid ""
+"By default APT will automatically remove the package (.deb) files once they "
+"have been successfully installed. To change this behavior place "
+"<tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:264
+msgid "The Interface"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:278
+msgid ""
+"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
+"same interface. It is a simple system that generally tells you what it will "
+"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
+"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
+"actually provides more functionality than is present in <prgn>apt-get</prgn> "
+"alone.</p></footnote> After printing out a summary of what will happen APT "
+"then will print out some informative status messages so that you can "
+"estimate how far along it is and how much is left to do."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:280
+msgid "Startup"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:284
+msgid ""
+"Before all operations except update, APT performs a number of actions to "
+"prepare its internal state. It also does some checks of the system's "
+"state. At any time these operations can be performed by running <tt>apt-get "
+"check</tt>."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:289
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:297
+msgid ""
+"The first thing it does is read all the package files into memory. APT uses "
+"a caching scheme so this operation will be faster the second time it is "
+"run. If some of the package files are not found then they will be ignored "
+"and a warning will be printed when apt-get exits."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:303
+msgid ""
+"The final operation performs a detailed analysis of the system's "
+"dependencies. It checks every dependency of every installed or unpacked "
+"package and considers if it is OK. Should this find a problem then a report "
+"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:320
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done\n"
+"You might want to run apt-get -f install' to correct these.\n"
+"Sorry, but the following packages have unmet dependencies:\n"
+" 9fonts: Depends: xlib6g but it is not installed\n"
+" uucp: Depends: mailx but it is not installed\n"
+" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" adduser: Depends: perl-base but it is not installed\n"
+" aumix: Depends: libgpmg1 but it is not installed\n"
+" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 but it is not installed\n"
+" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:329
+msgid ""
+"In this example the system has many problems, including a serious problem "
+"with libreadlineg2. For each package that has unmet dependencies a line is "
+"printed out indicating the package with the problem and the dependencies "
+"that are unmet. A short explanation of why the package has a dependency "
+"problem is also included."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:337
+msgid ""
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
+"packages when performing upgrades. <footnote><p>APT however considers all "
+"known dependencies and attempts to prevent broken "
+"packages</p></footnote>. The second is if a package installation fails "
+"during an operation. In this situation a package may have been unpacked "
+"without its dependents being installed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:345
+msgid ""
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
+"deduce a possible solution to the problem and then continue on. The APT "
+"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
+"for easy continuation of failed maintainer scripts."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:351
+msgid ""
+"However, if the <tt>-f</tt> option is used to correct a seriously broken "
+"system caused by the first case then it is possible that it will either fail "
+"immediately or the installation sequence will fail. In either case it is "
+"necessary to manually use dpkg (possibly with forcing options) to correct "
+"the situation enough to allow APT to proceed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:356
+msgid "The Status Report"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:363
+msgid ""
+"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
+"happen. Generally the report reflects the type of operation being performed "
+"but there are several common elements. In all cases the lists reflect the "
+"final state of things, taking into account the <tt>-f</tt> option and any "
+"other relevant activities to the command being executed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:364
+msgid "The Extra Package list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:372
+#, no-wrap
+msgid ""
+"The following extra packages will be installed:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:379
+msgid ""
+"The Extra Package list shows all of the packages that will be installed or "
+"upgraded in excess of the ones mentioned on the command line. It is only "
+"generated for an <tt>install</tt> command. The listed packages are often the "
+"result of an Auto Install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:382
+msgid "The Packages to Remove"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:389
+#, no-wrap
+msgid ""
+"The following packages will be REMOVED:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:399
+msgid ""
+"The Packages to Remove list shows all of the packages that will be removed "
+"from the system. It can be shown for any of the operations and should be "
+"given a careful inspection to ensure nothing important is to be taken "
+"off. The <tt>-f</tt> option is especially good at generating packages to "
+"remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:402
+msgid "The New Packages list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:406
+#, no-wrap
+msgid ""
+"The following NEW packages will installed:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:411
+msgid ""
+"The New Packages list is simply a reminder of what will happen. The packages "
+"listed are not presently installed in the system but will be when APT is "
+"done."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:414
+msgid "The Kept Back list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:419
+#, no-wrap
+msgid ""
+"The following packages have been kept back\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:428
+msgid ""
+"Whenever the whole system is being upgraded there is the possibility that "
+"new versions of packages cannot be installed because they require new things "
+"or conflict with already installed things. In this case the package will "
+"appear in the Kept Back list. The best way to convince packages listed there "
+"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
+"to resolve their problems."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:431
+msgid "Held Packages warning"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:435
+#, no-wrap
+msgid ""
+"The following held packages will be changed:\n"
+" cvs"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:441
+msgid ""
+"Sometimes you can ask APT to install a package that is on hold, in such a "
+"case it prints out a warning that the held package is going to be "
+"changed. This should only happen during dist-upgrade or install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:444
+msgid "Final summary"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:447
+msgid "Finally, APT will print out a summary of all the changes that will occur."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:452
+#, no-wrap
+msgid ""
+"206 packages upgraded, 8 newly installed, 23 to remove and 51 not "
+"upgraded.\n"
+"12 packages not fully installed or removed.\n"
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:470
+msgid ""
+"The first line of the summary simply is a reduced version of all of the "
+"lists and includes the number of upgrades - that is packages already "
+"installed that have new versions available. The second line indicates the "
+"number of poorly configured packages, possibly the result of an aborted "
+"installation. The final line shows the space requirements that the "
+"installation needs. The first pair of numbers refer to the size of the "
+"archive files. The first number indicates the number of bytes that must be "
+"fetched from remote locations and the second indicates the total size of all "
+"the archives required. The next number indicates the size difference between "
+"the presently installed packages and the newly installed packages. It is "
+"roughly equivalent to the space required in /usr after everything is "
+"done. If a large number of packages are being removed then the value may "
+"indicate the amount of space that will be freed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:473
+msgid ""
+"Some other reports can be generated by using the -u option to show packages "
+"to upgrade, they are similar to the previous examples."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:477
+msgid "The Status Display"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:481
+msgid ""
+"During the download of archives and package files APT prints out a series of "
+"status messages."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:490
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
+"Packages\n"
+"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:500
+msgid ""
+"The lines starting with <em>Get</em> are printed out when APT begins to "
+"fetch a file while the last line indicates the progress of the download. The "
+"first percent value on the progress line indicates the total percent done of "
+"all files. Unfortunately since the size of the Package files is unknown "
+"<tt>apt-get update</tt> estimates the percent done which causes some "
+"inaccuracies."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:509
+msgid ""
+"The next section of the status line is repeated once for each download "
+"thread and indicates the operation being performed and some useful "
+"information about what is happening. Sometimes this section will simply read "
+"<em>Forking</em> which means the OS is loading the download module. The "
+"first word after the [ is the fetch number as shown on the history "
+"lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:524
+msgid ""
+"Inside of the single quote is an informative string indicating the progress "
+"of the negotiation phase of the download. Typically it progresses from "
+"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
+"<em>Resuming</em>. The final value is the number of bytes downloaded from "
+"the remote site. Once the download begins this is represented as "
+"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
+"kilobytes is expected. The total size is always shown in 4 figure notation "
+"to preserve space. After the size display is a percent meter for the file "
+"itself. The second last element is the instantaneous average speed. This "
+"values is updated every 5 seconds and reflects the rate of data transfer for "
+"that period. Finally is shown the estimated transfer time. This is updated "
+"regularly and reflects the time to complete everything at the shown transfer "
+"rate."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:530
+msgid ""
+"The status display updates every half second to provide a constant feedback "
+"on the download progress while the Get lines scroll back whenever a new file "
+"is started. Since the status display is constantly updated it is unsuitable "
+"for logging to a file, use the <tt>-q</tt> option to remove the status "
+"display."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:535
+msgid "Dpkg"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:542
+msgid ""
+"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
+"to the <prgn>dpkg</prgn> interface once downloading is "
+"completed. <prgn>dpkg</prgn> will also ask a number of questions as it "
+"processes the packages and the packages themselves may also ask several "
+"questions. Before each question there is usually a description of what it is "
+"asking and the questions are too varied to discuss completely here."
+msgstr ""
+
+#. type: <title></title>
+#: offline.sgml:4
+msgid "Using APT Offline"
+msgstr ""
+
+#. type: <version></version>
+#: offline.sgml:7
+msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: offline.sgml:12
+msgid ""
+"This document describes how to use APT in a non-networked environment, "
+"specifically a 'sneaker-net' approach for performing upgrades."
+msgstr ""
+
+#. type: <copyrightsummary></copyrightsummary>
+#: offline.sgml:16
+msgid "Copyright &copy; Jason Gunthorpe, 1999."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:32
+msgid "Introduction"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+msgid "Overview"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:40
+msgid ""
+"Normally APT requires direct access to a Debian archive, either from a local "
+"media or through a network. Another common complaint is that a Debian "
+"machine is on a slow link, such as a modem and another machine has a very "
+"fast connection but they are physically distant."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:51
+msgid ""
+"The solution to this is to use large removable media such as a Zip disc or a "
+"SuperDisk disc. These discs are not large enough to store the entire Debian "
+"archive but can easily fit a subset large enough for most users. The idea is "
+"to use APT to generate a list of packages that are required and then fetch "
+"them onto the disc using another machine with good connectivity. It is even "
+"possible to use another Debian machine with APT or to use a completely "
+"different OS and a download tool like wget. Let <em>remote host</em> mean "
+"the machine downloading the packages, and <em>target host</em> the one with "
+"bad or no connection."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:57
+msgid ""
+"This is achieved by creatively manipulating the APT configuration file. The "
+"essential premis to tell APT to look on a disc for it's archive files. Note "
+"that the disc should be formated with a filesystem that can handle long file "
+"names such as ext2, fat32 or vfat."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:63
+msgid "Using APT on both machines"
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:71
+msgid ""
+"APT being available on both machines gives the simplest configuration. The "
+"basic idea is to place a copy of the status file on the disc and use the "
+"remote machine to fetch the latest package files and decide which packages "
+"to download. The disk directory structure should look like:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:80
+#, no-wrap
+msgid ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:88
+msgid "The configuration file"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:96
+msgid ""
+"The configuration file should tell APT to store its files on the disc and to "
+"use the configuration files on the disc as well. The sources.list should "
+"contain the proper sites that you wish to use from the remote machine, and "
+"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
+"<em>target host</em>. Please note, if you are using a local archive you must "
+"use copy URIs, the syntax is identical to file URIs."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:100
+msgid ""
+"<em>apt.conf</em> must contain the necessary information to make APT use the "
+"disc:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:124
+#, no-wrap
+msgid ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it "
+"tells\n"
+" the remote APT what architecture the target machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:129
+msgid ""
+"More details can be seen by examining the apt.conf man page and the sample "
+"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:136
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy "
+"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
+"directories outlined in the Overview, <em>archives/partial/</em> and "
+"<em>lists/partial/</em> Then take the disc to the remote machine and "
+"configure the sources.list. On the remote machine execute the following:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:142
+#, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT fetches the package files ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT fetches all the packages needed to upgrade the target machine ]"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:149
+msgid ""
+"The dist-upgrade command can be replaced with any-other standard APT "
+"commands, particularly dselect-upgrade. You can even use an APT front end "
+"such as <em>dselect</em> However this presents a problem in communicating "
+"your selections back to the local computer."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:153
+msgid ""
+"Now the disc contains all of the index files and archives needed to upgrade "
+"the target machine. Take the disc back and run:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:159
+#, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT generates a local copy of the cache files ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Or any other APT command ]"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:165
+msgid ""
+"It is necessary for proper function to re-specify the status file to be the "
+"local one. This is very important!"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:172
+msgid ""
+"If you are using dselect you can do the very risky operation of copying "
+"disc/status to /var/lib/dpkg/status so that any selections you made on the "
+"remote machine are updated. I highly recommend that people only make "
+"selections on the local machine - but this may not always be possible. DO "
+"NOT copy the status file if dpkg or APT have been run in the mean time!!"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:178
+msgid "Using APT and wget"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:185
+msgid ""
+"<em>wget</em> is a popular and portable download tool that can run on nearly "
+"any machine. Unlike the method above this requires that the Debian machine "
+"already has a list of available packages."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:190
+msgid ""
+"The basic idea is to create a disc that has only the archive files "
+"downloaded from the remote site. This is done by using the --print-uris "
+"option to apt-get and then preparing a wget script to actually fetch the "
+"packages."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:196
+msgid "Operation"
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:200
+msgid ""
+"Unlike the previous technique no special configuration files are "
+"required. We merely use the standard APT commands to generate the file list."
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:205
+#, no-wrap
+msgid ""
+" # apt-get dist-upgrade \n"
+" [ Press no when prompted, make sure you are happy with the actions ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:210
+msgid ""
+"Any command other than dist-upgrade could be used here, including "
+"dselect-upgrade."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:216
+msgid ""
+"The /disc/wget-script file will now contain a list of wget commands to "
+"execute in order to fetch the necessary archives. This script should be run "
+"with the current directory as the disc's mount point so as to save the "
+"output on the disc."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:219
+msgid "The remote machine would do something like"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:223
+#, no-wrap
+msgid ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ wait.. ]"
+msgstr ""
+
+#. type: </example><example>
+#: offline.sgml:228
+msgid ""
+"Once the archives are downloaded and the disc returned to the Debian machine "
+"installation can proceed using,"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:230
+#, no-wrap
+msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:234
+msgid "Which will use the already fetched archives on the disc."
+msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 23c4c5b27..3ec7c4a5b 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2009-12-01 19:13+0100\n"
+"POT-Creation-Date: 2009-11-27 00:05+0100\n"
"PO-Revision-Date: 2009-10-28 23:51+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -350,11 +350,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -398,11 +404,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -414,11 +426,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:108
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -430,11 +448,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:114
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dselect \"<citerefentry>\n"
+#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -1054,7 +1078,7 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
-#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
"February 2004</date>"
@@ -1351,10 +1375,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
+#, fuzzy
+#| msgid ""
+#| "<literal>Missing</literal> is the number of package names that were "
+#| "referenced in a dependency but were not provided by any package. Missing "
+#| "packages may be in evidence if a full distribution is not accessed, or if "
+#| "a package (real or virtual) has been dropped from the distribution. "
+#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be in evidence if a full distribution is not accessed, or if a "
+"packages may be an evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1554,6 +1585,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
#, fuzzy
+#| msgid ""
+#| "Note that a package which APT knows of is not nessasarily available to "
+#| "download, installable or installed, e.g. virtual packages are also listed "
+#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1671,7 +1706,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
msgid "options"
msgstr "Optionen"
@@ -1907,14 +1942,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:973 apt_preferences.5.xml:615
+#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
msgid "Files"
msgstr "Dateien"
@@ -1925,10 +1960,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 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:979 apt_preferences.5.xml:622
-#: sources.list.5.xml:221
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -1939,7 +1974,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2317,7 +2352,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2408,10 +2443,15 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
+#, fuzzy
+#| msgid ""
+#| "Temporary directory in which to write extracted debconf template files "
+#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
+#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
-"literal>"
+"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
+"TempDir</literal>"
msgstr ""
"Temporäres Verzeichnis, in das die extrahierten DebConf-Schablonendateien "
"und Konfigurationsdateien geschrieben werden. Konfigurationselement: "
@@ -2426,6 +2466,20 @@ msgstr ""
"<command>apt-extracttemplates</command> gibt bei normalen Operationen 0 "
"zurück, dezimal 100 bei Fehlern."
+#. The last update date
+#. type: Content of: <refentry><refentryinfo>
+#: apt-ftparchive.1.xml:13
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
+msgid ""
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"August 2009</date>"
+msgstr ""
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. "
+"August 2009</date>"
+
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
msgid "apt-ftparchive"
@@ -2712,11 +2766,17 @@ msgstr "Dir-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
+#, fuzzy
+#| msgid ""
+#| "The <literal>Dir</literal> section defines the standard directories "
+#| "needed to locate the files required during the generation process. These "
+#| "directories are prepended to certain relative paths defined in later "
+#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended to certain relative paths defined in later "
-"sections to produce a complete an absolute path."
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
msgstr ""
"Der <literal>Dir</literal>-Abschnitt definiert die Vorgabeverzeichnisse, die "
"zum Orten der benötigten Dateien während des Generierungsprozesses gebraucht "
@@ -3516,20 +3576,37 @@ msgstr ""
"Gibt der Zwischenspeicherdatenbank nur Lesezugriff. Konfigurationselement: "
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:547
+#, fuzzy
+#| msgid "<option>--version</option>"
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+msgid ""
+"This configuration option defaults to \"<literal>true</literal>\" and should "
+"only be set to <literal>\"false\"</literal> if the Archive generated with "
+"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
+"that it is currently not possible to create these files with <command>apt-"
+"ftparchive</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462
-#: sources.list.5.xml:181
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:567
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:563
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3539,7 +3616,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:577
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3557,8 +3634,8 @@ msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>8. "
"November 2008</date>"
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:29
+#. type: <heading></heading>
+#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
msgid "apt-get"
msgstr "apt-get"
@@ -3677,8 +3754,8 @@ msgstr ""
"bewusst, dass die Gesamtfortschrittsanzeige nicht richtig sein wird, da die "
"Größe der Pakete nicht im voraus bekannt ist."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:147
+#. type: <tag></tag>
+#: apt-get.8.xml:147 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
@@ -3730,8 +3807,8 @@ msgstr ""
"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
"Installieren von neuen Paketen)."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:170
+#. type: <tag></tag>
+#: apt-get.8.xml:170 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
@@ -3759,8 +3836,8 @@ msgstr ""
"abgerufen werden. Siehe auch &apt-preferences; für einen Mechanismus zum "
"überschreiben der allgemeinen Einstellungen für einzelne Pakete."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:183
+#. type: <tag></tag>
+#: apt-get.8.xml:183 guide.sgml:131
msgid "install"
msgstr "install"
@@ -3914,6 +3991,14 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
#, fuzzy
+#| msgid ""
+#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
+#| "source packages. APT will examine the available packages to decide which "
+#| "source package to fetch. It will then find and download into the current "
+#| "directory the newest available version of that source package while "
+#| "respect the default release, set with the option <literal>APT::Default-"
+#| "Release</literal>, the <option>-t</option> option or per package with "
+#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3950,8 +4035,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> options is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
-"If the <option>--compile</option> options is specified then the package will "
+"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -4250,11 +4341,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages with and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages with and empty set of square brackets meaning "
-"breaks that are of no consequence (rare)."
+"indicate broken packages and empty set of square brackets meaning breaks "
+"that are of no consequence (rare)."
msgstr ""
"Simulieren gibt eine Serie von Zeilen aus, von denen jede eine Dpkg-"
"Operation darstellt: Konfigurieren (Conf), Entfernen (Remv), Entpacken "
@@ -5014,9 +5111,13 @@ msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of manually installed "
+#| "packages with each package on a new line."
msgid ""
-"<literal>showauto</literal> is used to print a list of manually installed "
-"packages with each package on a new line."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> wird benutzt, um eine Liste manuell "
"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
@@ -5165,12 +5266,20 @@ msgstr "Vertrauenswürdige Archive"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "different steps. <command>apt-secure</command> is the last step in this "
+#| "chain, trusting an archive does not mean that the packages that you trust "
+#| "it do not contain malicious code but means that you trust the archive "
+#| "maintainer. Its the archive maintainer responsibility to ensure that the "
+#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. Its the archive maintainer responsibility to ensure that the "
+"maintainer. It's the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
"Eine Kette des Vertrauens von einem APT-Archiv zum Endanwender wird durch "
@@ -5214,13 +5323,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sum of all of the packages "
+#| "files are then computed and put into the Release file. The Release file "
+#| "is then signed by the archive key (which is created once a year and "
+#| "distributed through the FTP server. This key is also on the Debian "
+#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year and distributed through the "
-"FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year) and distributed through "
+"the FTP server. This key is also on the Debian keyring."
msgstr ""
"Sobald das hochgeladenen Paket überprüft und in das Archiv hinzugefügt "
"wurde, wird die Betreuersignatur entfernt, eine MD5-Summe des Pakets "
@@ -5347,8 +5465,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
+#, fuzzy
+#| msgid ""
+#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
+#| "already. You can do this by running <command>apt-ftparchive release</"
+#| "command> (provided in apt-utils)."
msgid ""
-"<literal>Create a toplevel Release file</literal>. if it does not exist "
+"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
@@ -5358,17 +5481,26 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
+#, fuzzy
+#| msgid ""
+#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
+#| "o Release.gpg Release</command>."
msgid ""
-"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
+"o Release.gpg Release</command>."
msgstr ""
"<literal>Sign it</literal>. Sie können dies tun, indem Sie <command>gpg -abs "
"-o Release.gpg Release</command> ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>Publish the key fingerprint</literal>, that way your users will "
+#| "know what key they need to import in order to authenticate the files in "
+#| "the archive."
msgid ""
-"<literal>Publish the key fingerprint</literal>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -5548,11 +5680,18 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:50
+#, fuzzy
+#| msgid ""
+#| "The configuration file is organized in a tree with options organized into "
+#| "functional groups. option specification is given with a double colon "
+#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
+#| "option within the APT tool group, for the Get tool. options do not "
+#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. option specification is given with a double colon "
+"functional groups. Option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. options do not inherit from "
+"within the APT tool group, for the Get tool. Options do not inherit from "
"their parent groups."
msgstr ""
"Die Konfigurationsdatei ist in einem Baum mit Optionen organisiert, die in "
@@ -5564,12 +5703,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:56
#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal> The trailing semicolon is required and the quotes are "
+#| "optional. A new scope can be opened with curly braces, like:"
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
"treated as comments (ignored), as well as all text between <literal>/*</"
"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing "
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
"semicolon and the quotes are required. The value must be on one line, and "
"there is no kind of string concatenation. It must not include inside "
"quotes. The behavior of the backslash \"\\\" and escaped characters inside "
@@ -5662,6 +5809,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:98
#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> and "
+#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included. <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendants are "
+#| "erased. (Note that these lines also need to end with a semicolon.)"
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5835,25 +5989,43 @@ msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Disable Immediate Configuration; This dangerous option disables some of "
-"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-"necessary on some extremely slow single user systems but is very dangerous "
-"and may cause package install scripts to fail or worse. Use at your own "
-"risk."
+"Defaults to on which will cause APT to install essential and important "
+"packages as fast as possible in the install/upgrade operation. This is done "
+"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
+"does treat an important package in the same way as an extra package: Between "
+"the unpacking of the important package A and his configuration can then be "
+"many other unpack or configuration calls, e.g. for package B which has no "
+"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
+"script of package B generates an error) which results in a system state in "
+"which package A is unpacked but unconfigured - each package depending on A "
+"is now no longer guaranteed to work as their dependency on A is not longer "
+"satisfied. The immediate configuration marker is also applied to all "
+"dependencies which can generate a problem if the dependencies e.g. form a "
+"circle as a dependency with the immediate flag is comparable with a Pre-"
+"Dependency. So in theory it is possible that APT encounters a situation in "
+"which it is unable to perform immediate configuration, error out and refers "
+"to this option so the user can deactivate the immediate configuration "
+"temporary to be able to perform an install/upgrade again. Note the use of "
+"the word \"theory\" here as this problem was only encountered by now in real "
+"world a few times in non-stable distribution versions and caused by wrong "
+"dependencies of the package in question or by a system in an already broken "
+"state, so you should not blindly disable this option as the mentioned "
+"scenario above is not the only problem immediate configuration can help to "
+"prevent in the first place. Before a big operation like <literal>dist-"
+"upgrade</literal> is run with this option disabled it should be tried to "
+"explicitly <literal>install</literal> the package APT is unable to configure "
+"immediately, but please make sure to report your problem also to your "
+"distribution and to the APT team with the buglink below so they can work on "
+"improving or correcting the upgrade process."
msgstr ""
-"Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet einigen "
-"Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener aufzurufen. "
-"Dies zu tun, könnte auf besonders langsamen Einzelbenutzersystemen nötig "
-"sein, ist aber gefährlich und könnte Paketinstallationsskripte zum Scheitern "
-"oder schlimmeren veranlassen. Benutzen Sie es auf eigene Gefahr."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:181
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:182
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5871,12 +6043,12 @@ msgstr ""
"bash oder etwas, was davon abhängt, sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:190
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:191
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -5886,24 +6058,24 @@ msgstr ""
"(in Bytes)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:195
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:196
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
"werde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:199
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:200
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5913,12 +6085,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:189
+#: apt.conf.5.xml:204
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:205
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5928,12 +6100,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:194
+#: apt.conf.5.xml:209
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:210
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5943,17 +6115,17 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:216
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:221
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:222
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -5963,12 +6135,12 @@ msgstr ""
"True."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:227
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:213
+#: apt.conf.5.xml:228
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -5984,12 +6156,12 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:235
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:236
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -5998,12 +6170,12 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:240
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:226
+#: apt.conf.5.xml:241
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6013,12 +6185,12 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:230 sources.list.5.xml:139
+#: apt.conf.5.xml:245 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:246
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6036,7 +6208,7 @@ msgstr ""
"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:239
+#: apt.conf.5.xml:254
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6062,7 +6234,7 @@ msgstr ""
"unterstützt keine dieser Optionen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:249 apt.conf.5.xml:306
+#: apt.conf.5.xml:264 apt.conf.5.xml:328
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6073,10 +6245,19 @@ msgstr ""
"Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:252
+#: apt.conf.5.xml:267
+#, fuzzy
+#| msgid ""
+#| "One setting is provided to control the pipeline depth in cases where the "
+#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+#| "5 indicating how many outstanding requests APT should send. A value of "
+#| "zero MUST be specified if the remote host does not properly linger on TCP "
+#| "connections - otherwise data corruption will occur. Hosts which require "
+#| "this are in violation of RFC 2068."
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -6093,7 +6274,7 @@ msgstr ""
"gegen RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:275
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6108,16 +6289,31 @@ msgstr ""
"implizit das Herunterladen von mehreren Servern zur gleichen Zeit "
"deaktiviert.)"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:266
+#: apt.conf.5.xml:286
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-msgid ""
-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
+#: apt.conf.5.xml:287
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control and proxy options are the same as for "
+#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
+#| "is not supported yet."
+msgid ""
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
"HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen "
@@ -6125,7 +6321,7 @@ msgstr ""
"literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:271
+#: apt.conf.5.xml:293
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6164,12 +6360,12 @@ msgstr ""
"SslForceVersion</literal> ist die entsprechende per-Host-Option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:150
+#: apt.conf.5.xml:311 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:290
+#: apt.conf.5.xml:312
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6204,7 +6400,7 @@ msgstr ""
"entsprechenden URI-Bestandteil genommen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:309
+#: apt.conf.5.xml:331
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6221,7 +6417,7 @@ msgstr ""
"Beispielskonfiguration, um Beispiele zu erhalten)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:338
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6235,7 +6431,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:321
+#: apt.conf.5.xml:343
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6251,18 +6447,19 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:328 sources.list.5.xml:132
+#: apt.conf.5.xml:350 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:356
#, fuzzy, no-wrap
+#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:351
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6284,12 +6481,12 @@ msgstr ""
"können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:361
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340
+#: apt.conf.5.xml:362
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6300,18 +6497,18 @@ msgstr ""
"Zusätzliche Parameter werden an gpgv weitergeleitet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:367
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:373
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:368
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6331,19 +6528,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:381
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:374
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6365,7 +6562,7 @@ msgstr ""
"Fehler fortfahren. Um daher einen nach dem anderen Typ vorzuziehen, fügen "
"Sie einfach den bevorzugten Typ zuerst in die Liste – noch nicht "
"hinzugefügte Standardtypen werden zur Laufzeit an das Ende der Liste "
-"angehängt, so kann z.B. <placeholder type=\"synopsis\"id=\"0\"/> verwandt "
+"angehängt, so kann z.B. <placeholder type=\"synopsis\" id=\"0\"/> verwandt "
"werden, um <command>gzip</command>-komprimierte Dateien über <command>bzip2</"
"command> und <command>lzma</command> zu bevorzugen. Falls <command>lzma</"
"command> vor <command>gzip</command> und <command>bzip2</command> vorgezogen "
@@ -6374,13 +6571,13 @@ msgstr ""
"explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:385
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:383
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6406,7 +6603,7 @@ msgstr ""
"diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:390
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6422,8 +6619,55 @@ msgstr ""
"unkomprimierte Dateien vorzuziehen, um den Gebrauch lokaler Spiegel zu "
"unterstützen."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:396
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:397
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the Description-"
+"Translations. APT will try to display the first available Description for "
+"the Language which is listed at first. Languages can be defined with their "
+"short or long Languagecodes. Note that not all archives provide "
+"<filename>Translation</filename> files for every Language - especially the "
+"long Languagecodes are rare, so please inform you which ones are available "
+"before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:413
+#, no-wrap
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+msgid ""
+"The default list includes \"environment\" and \"en\". "
+"\"<literal>environment</literal>\" has a special meaning here: It will be "
+"replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used. To "
+"force apt to use no Translation file use the setting <literal>Acquire::"
+"Languages=none</literal>. \"<literal>none</literal>\" is another special "
+"meaning code which will stop the search for a fitting <filename>Translation</"
+"filename> file. This can be used by the system administrator to let APT "
+"know that it should download also this files without actually use them if "
+"not the environment specifies this languages. So the following example "
+"configuration will result in the order \"en, de\" in an english and in \"de, "
+"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
+"if APT is not used in a french localization, in such an environment the "
+"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
+"\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:217
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6433,12 +6677,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:420
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:422
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6458,7 +6702,7 @@ msgstr ""
"filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:429
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6481,7 +6725,7 @@ msgstr ""
"<literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:438
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6496,7 +6740,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:444
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6508,7 +6752,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:448
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6526,7 +6770,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:456
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6546,12 +6790,12 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:469
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:471
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6562,12 +6806,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:475
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:476
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6585,7 +6829,7 @@ msgstr ""
"Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:485
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6594,12 +6838,12 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:489
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:490
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6608,12 +6852,12 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:451
+#: apt.conf.5.xml:494
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:495
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6622,12 +6866,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:501
msgid "How APT calls dpkg"
msgstr "Wie APT Dpkg aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:502
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6636,7 +6880,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:507
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6647,17 +6891,17 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:513
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6671,12 +6915,12 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:519
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:477
+#: apt.conf.5.xml:520
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6693,7 +6937,7 @@ msgstr ""
"pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:526
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6709,12 +6953,12 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:533
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:534
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6723,12 +6967,12 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:538
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:539
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6738,12 +6982,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:544
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:545
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 "
@@ -6769,7 +7013,7 @@ msgstr ""
"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:560
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6783,7 +7027,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:554
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 "
@@ -6808,17 +7052,27 @@ msgstr ""
"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:566
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
-msgid ""
-"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+#: apt.conf.5.xml:567
+#, fuzzy
+#| 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."
+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 then this flag is present unless it is "
-"explicit called to do so in an extra call. Note that this option exists "
+"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 add these flag also to the unpack and remove calls."
@@ -6834,12 +7088,26 @@ msgstr ""
"außerdem an die unpack- und remove-Aufrufe anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:574
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:575
+#, fuzzy
+#| msgid ""
+#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#| "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
+#| "value and causes APT to configure all packages explicit. The "
+#| "\"<literal>smart</literal>\" way is it to configure only packages which "
+#| "need to be configured before another package can be unpacked (Pre-"
+#| "Depends) and let the rest configure by dpkg with a call generated by the "
+#| "next option. \"<literal>no</literal>\" on the other hand will not "
+#| "configure anything and totally relay on dpkg for configuration (which "
+#| "will at the moment fail if a Pre-Depends is encountered). Setting this "
+#| "option to another than the all value will implicit activate also the next "
+#| "option per default as otherwise the system could end in an unconfigured "
+#| "status which could be unbootable!"
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6848,9 +7116,9 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next option. "
"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally relay on dpkg for configuration (which will at the moment fail if a "
+"totally rely on dpkg for configuration (which will at the moment fail if a "
"Pre-Depends is encountered). Setting this option to another than the all "
-"value will implicit activate also the next option per default as otherwise "
+"value will implicitly activate also the next option per default as otherwise "
"the system could end in an unconfigured status which could be unbootable!"
msgstr ""
"Gültige Werte sind »<literal>all</literal>«, »<literal>smart</literal>« und "
@@ -6868,18 +7136,26 @@ msgstr ""
"mehr startbar sein könnte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:542
+#: apt.conf.5.xml:585
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:586
+#, 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 automatic per default if the previous option is "
+#| "not set to <literal>all</literal>, 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 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 automatic per default if the previous option is not set "
"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In this sceneries "
+"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 ""
"Wenn diese Option gesetzt ist, wird APT <command>dpkg --configure --pending</"
@@ -6892,12 +7168,12 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:592
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:593
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6913,12 +7189,12 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:555
+#: apt.conf.5.xml:598
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:599
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6937,12 +7213,12 @@ msgstr ""
"und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:606
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:614
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6960,7 +7236,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:607
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -6984,12 +7260,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:627
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:628
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7003,12 +7279,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:636
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:638
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7026,7 +7302,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:649
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7037,7 +7313,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:657
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7048,7 +7324,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:623
+#: apt.conf.5.xml:666
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7060,7 +7336,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:631
+#: apt.conf.5.xml:674
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7069,17 +7345,17 @@ msgstr ""
"Daten in CDROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:684
msgid "A full list of debugging options to apt follows."
msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:689
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:650
+#: apt.conf.5.xml:693
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7087,48 +7363,48 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:700
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:661
+#: apt.conf.5.xml:704
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:711
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:672
+#: apt.conf.5.xml:715
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:722
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:683
+#: apt.conf.5.xml:726
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:733
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:694
+#: apt.conf.5.xml:737
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7137,12 +7413,12 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:744
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:748
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7151,23 +7427,23 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:755
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:758
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:765
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:768
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7176,12 +7452,12 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:775
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:778
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 "
@@ -7192,12 +7468,12 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:786
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:789
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."
@@ -7207,24 +7483,24 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:754
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:801
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:808
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:768
+#: apt.conf.5.xml:811
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7233,12 +7509,12 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:818
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:778
+#: apt.conf.5.xml:821
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7247,12 +7523,12 @@ msgstr ""
"und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:829
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:790
+#: apt.conf.5.xml:833
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7262,12 +7538,12 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:840
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:801
+#: apt.conf.5.xml:844
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7275,12 +7551,12 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:851
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:855
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7290,12 +7566,12 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:862
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:822
+#: apt.conf.5.xml:865
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7311,12 +7587,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:876
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:836
+#: apt.conf.5.xml:879
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7348,23 +7624,23 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:901
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:908
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:911
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7374,12 +7650,12 @@ msgstr ""
"sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:922
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7388,12 +7664,12 @@ msgstr ""
"alle während deren Auswertung gefundenen Fehler ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:886
+#: apt.conf.5.xml:929
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:933
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7403,12 +7679,12 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:941
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:945
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7416,22 +7692,22 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:952
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:956
msgid "Output the priority of each package list on startup."
msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:962
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:966
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7441,12 +7717,12 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:974
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:934
+#: apt.conf.5.xml:977
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 "
@@ -7458,12 +7734,12 @@ msgstr ""
"beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:985
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:989
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7472,7 +7748,7 @@ msgstr ""
"gelesenen Anbieter ausgeben."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1012
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7481,13 +7757,13 @@ msgstr ""
"möglichen Optionen zeigen."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:975
+#: apt.conf.5.xml:1019
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1024
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -8726,11 +9002,17 @@ msgstr "Paketressourcenliste für APT"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
+#, fuzzy
+#| msgid ""
+#| "The package resource list is used to locate archives of the package "
+#| "distribution system in use on the system. At this time, this manual page "
+#| "documents only the packaging system used by the Debian GNU/Linux system. "
+#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is located in <filename>/etc/apt/sources.list</filename>"
+"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
"das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese "
@@ -8740,12 +9022,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
+#, fuzzy
+#| msgid ""
+#| "The source list is designed to support any number of active sources and a "
+#| "variety of source media. The file lists one source per line, with the "
+#| "most preferred source listed first. The format of each line is: "
+#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#| "determines the format for <literal>args</literal> <literal>uri</literal> "
+#| "is a Universal Resource Identifier (URI), which is a superset of the more "
+#| "specific and well-known Universal Resource Locator, or URL. The rest of "
+#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -8791,13 +9083,24 @@ msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. Typically, "
+#| "<literal>distribution</literal> is generally one of <literal>stable</"
+#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
+#| "component is one of <literal>main</literal> <literal>contrib</literal> "
+#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
+#| "src</literal> type describes a debian distribution's source code in the "
+#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
+#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
"<literal>distribution</literal> is generally one of <literal>stable</"
"literal> <literal>unstable</literal> or <literal>testing</literal> while "
"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
+"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
"src</literal> type describes a debian distribution's source code in the same "
"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line "
"is required to fetch source indexes."
@@ -8815,9 +9118,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types are:"
+"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
"Das Format für einen <filename>sources.list</filename>-Eintrag, der die "
"<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
@@ -8830,13 +9137,23 @@ msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (/). This is useful for when only a particular sub-"
+#| "section of the archive denoted by the URI is of interest. If "
+#| "<literal>distribution</literal> does not specify an exact path, at least "
+#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when only a particular sub-section of the "
-"archive denoted by the URI is of interest. If <literal>distribution</"
+"a slash (/). This is useful for when the case only a particular sub-section "
+"of the archive denoted by the URI is of interest. If <literal>distribution</"
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
@@ -8958,12 +9275,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "The http scheme specifies an HTTP server for the archive. If an "
+#| "environment variable <envar>http_proxy</envar> is set with the format "
+#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#| "string of the format http://user:pass@server:port/ Note that this is an "
+#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/ Note that this is an insecure method of "
+"http://user:pass@server:port/. Note that this is an insecure method of "
"authentication."
msgstr ""
"Das http-Schema gibt einen HTTP-Server für das Archiv an. Wenn eine "
@@ -9036,6 +9361,24 @@ msgstr ""
"<command>find</command> und <command>dd</command>, um die Datenübertragung "
"aus der Ferne durchzuführen."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:178
+msgid "more recongnizable URI types"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:180
+msgid ""
+"APT can be extended with more methods shipped in other optional packages "
+"which should follow the nameing scheme <literal>apt-transport-"
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"also the <literal>apt-transport-https</literal> package which provides "
+"access methods for https-URIs with features similiar to the http method, but "
+"other methods for using e.g. debtorrent are also available, see "
+"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
+"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
msgid ""
@@ -9046,7 +9389,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:194
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9055,36 +9398,36 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:196
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:198
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Wie oben, außer das dies die unstable- (Entwicklungs-) Distribution benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:187
+#: sources.list.5.xml:199
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:201
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:202
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:192
+#: sources.list.5.xml:204
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9093,13 +9436,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:206
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:208
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
@@ -9108,18 +9451,24 @@ msgstr ""
"Verzeichnis zuzugreifen und nur den stable/contrib-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:210
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:212
+#, fuzzy
+#| msgid ""
+#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
+#| "directory, and uses only the unstable/contrib area. If this line appears "
+#| "as well as the one in the previous example in <filename>sources.list</"
+#| "filename>. a single FTP session will be used for both resource lines."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</"
-"filename>. a single FTP session will be used for both resource lines."
+"well as the one in the previous example in <filename>sources.list</filename> "
+"a single FTP session will be used for both resource lines."
msgstr ""
"Benutzt FTP, um auf das Archiv auf ftp.debian.org unter dem debian-"
"Verzeichnis zuzugreifen und nur den unstable/contrib-Bereich zu benutzen. "
@@ -9128,13 +9477,13 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:216
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:218
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -9143,19 +9492,19 @@ msgstr ""
"Verzeichnis zuzugreifen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:222
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9174,6 +9523,1086 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:234
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
+
+#. type: <title></title>
+#: guide.sgml:4
+msgid "APT User's Guide"
+msgstr ""
+
+#. type: <author></author>
+#: guide.sgml:6 offline.sgml:6
+msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+msgstr ""
+
+#. type: <version></version>
+#: guide.sgml:7
+msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: guide.sgml:11
+msgid ""
+"This document provides an overview of how to use the the APT package manager."
+msgstr ""
+
+#. type: <copyrightsummary></copyrightsummary>
+#: guide.sgml:15
+msgid "Copyright &copy; Jason Gunthorpe, 1998."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:21 offline.sgml:22
+msgid ""
+"\"APT\" and this document are free software; you can redistribute them and/"
+"or modify them under the terms of the GNU General Public License as "
+"published by the Free Software Foundation; either version 2 of the License, "
+"or (at your option) any later version."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:24 offline.sgml:25
+msgid ""
+"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"common-licenses/GPL for the full license."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:32
+#, fuzzy
+#| msgid "generate"
+msgid "General"
+msgstr "generate"
+
+#. type: <p></p>
+#: guide.sgml:38
+msgid ""
+"The APT package currently contains two sections, the APT <prgn>dselect</"
+"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
+"provide a way to install and remove packages as well as download new "
+"packages from the Internet."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:39
+msgid "Anatomy of the Package System"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:44
+msgid ""
+"The Debian packaging system has a large amount of information associated "
+"with each package to help assure that it integrates cleanly and easily into "
+"the system. The most prominent of its features is the dependency system."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:52
+msgid ""
+"The dependency system allows individual programs to make use of shared "
+"elements in the system such as libraries. It simplifies placing infrequently "
+"used portions of a program in separate packages to reduce the number of "
+"things the average user is required to install. Also, it allows for choices "
+"in mail transport agents, X servers and so on."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:57
+msgid ""
+"The first step to understanding the dependency system is to grasp the "
+"concept of a simple dependency. The meaning of a simple dependency is that a "
+"package requires another package to be installed at the same time to work "
+"properly."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:63
+msgid ""
+"For instance, mailcrypt is an emacs extension that aids in encrypting email "
+"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"simple dependency on GPG. Also, because it is an emacs extension it has a "
+"simple dependency on emacs, without emacs it is completely useless."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:73
+msgid ""
+"The other important dependency to understand is a conflicting dependency. It "
+"means that a package, when installed with another package, will not work and "
+"may possibly be extremely harmful to the system. As an example consider a "
+"mail transport agent such as sendmail, exim or qmail. It is not possible to "
+"have two mail transport agents installed because both need to listen to the "
+"network to receive mail. Attempting to install two will seriously damage the "
+"system so all mail transport agents have a conflicting dependency with all "
+"other mail transport agents."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:83
+msgid ""
+"As an added complication there is the possibility for a package to pretend "
+"to be another package. Consider that exim and sendmail for many intents are "
+"identical, they both deliver mail and understand a common interface. Hence, "
+"the package system has a way for them to declare that they are both mail-"
+"transport-agents. So, exim and sendmail both declare that they provide a "
+"mail-transport-agent and other packages that need a mail transport agent "
+"depend on mail-transport-agent. This can add a great deal of confusion when "
+"trying to manually fix packages."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:88
+msgid ""
+"At any given time a single dependency may be met by packages that are "
+"already installed or it may not be. APT attempts to help resolve dependency "
+"issues by providing a number of automatic algorithms that help in selecting "
+"packages for installation."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:102
+msgid ""
+"<prgn>apt-get</prgn> provides a simple way to install packages from the "
+"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
+"understand .deb files, it works with the package's proper name and can only "
+"install .deb archives from a <em>Source</em>."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:109
+msgid ""
+"The first <footnote><p>If you are using an http proxy server you must set "
+"the http_proxy environment variable first, see sources.list(5)</p></"
+"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
+"fetch the package lists from the <em>Sources</em> so that it knows what "
+"packages are available. This is done with <tt>apt-get update</tt>. For "
+"instance,"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:116
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p><taglist>
+#: guide.sgml:120
+msgid "Once updated there are several commands that can be used:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:131
+msgid ""
+"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
+"install a new package or remove an existing package, nor will it ever "
+"upgrade a package that might cause some other package to break. This can be "
+"used daily to relatively safely upgrade the system. Upgrade will list all of "
+"the packages that it could not upgrade, this usually means that they depend "
+"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
+"<tt>apt-get install</tt> can be used to force these packages to install."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:140
+msgid ""
+"Install is used to install packages by name. The package is automatically "
+"fetched and installed. This can be useful if you already know the name of "
+"the package to install and do not want to go into a GUI to select it. Any "
+"number of packages may be passed to install, they will all be fetched. "
+"Install automatically attempts to resolve dependency problems with the "
+"listed packages and will print a summary and ask for confirmation if "
+"anything other than its arguments are changed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:149
+msgid ""
+"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
+"releases of Debian. It uses a sophisticated algorithm to determine the best "
+"set of packages to install, upgrade and remove to get as much of the system "
+"to the newest release. In some situations it may be desired to use dist-"
+"upgrade rather than spend the time manually resolving dependencies in "
+"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
+"prgn> can be used to install any packages that may have been left out."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:152
+msgid ""
+"It is important to closely look at what dist-upgrade is going to do, its "
+"decisions may sometimes be quite surprising."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:163
+msgid ""
+"<prgn>apt-get</prgn> has several command line options that are detailed in "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"option is <tt>-d</tt> which does not install the fetched files. If the "
+"system has to download a large number of package it would be undesired to "
+"start installing them in case something goes wrong. When <tt>-d</tt> is used "
+"the downloaded archives can be installed by simply running the command that "
+"caused them to be downloaded again without <tt>-d</tt>."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:168
+#, fuzzy
+#| msgid "APT in DSelect"
+msgid "DSelect"
+msgstr "APT in DSelect"
+
+#. type: <p></p>
+#: guide.sgml:173
+msgid ""
+"The APT <prgn>dselect</prgn> method provides the complete APT system with "
+"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
+"to select the packages to be installed or removed and APT actually installs "
+"them."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:184
+msgid ""
+"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
+"prgn> and then choose the APT method. You will be prompted for a set of "
+"<em>Sources</em> which are places to fetch archives from. These can be "
+"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"provide a fragment of the total Debian archive, APT will automatically "
+"combine them to form a complete set of packages. If you have a CDROM then it "
+"is a good idea to specify it first and then specify a mirror so that you "
+"have access to the latest bug fixes. APT will automatically use packages on "
+"your CDROM before downloading from the Internet."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:198
+#, no-wrap
+msgid ""
+" Set up a list of distribution source locations\n"
+"\t \n"
+" Please give the base URL of the debian distribution.\n"
+" The access schemes I know about are: http file\n"
+"\t \n"
+" For example:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:205
+msgid ""
+"The <em>Sources</em> setup starts by asking for the base of the Debian "
+"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
+"get."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:212
+#, no-wrap
+msgid ""
+" Please give the distribution tag to get or a path to the\n"
+" package file ending in a /. The distribution\n"
+" tags are typically something like: stable unstable testing non-US\n"
+" \n"
+" Distribution [stable]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:222
+msgid ""
+"The distribution refers to the Debian version in the archive, <em>stable</"
+"em> refers to the latest released version and <em>unstable</em> refers to "
+"the developmental version. <em>non-US</em> is only available on some mirrors "
+"and refers to packages that contain encryption technology or other things "
+"that cannot be exported from the United States. Importing these packages "
+"into the US is legal however."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:228
+#, no-wrap
+msgid ""
+" Please give the components to get\n"
+" The components are typically something like: main contrib non-free\n"
+" \n"
+" Components [main contrib non-free]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:236
+msgid ""
+"The components list refers to the list of sub distributions to fetch. The "
+"distribution is split up based on software licenses, main being DFSG free "
+"packages while contrib and non-free contain things that have various "
+"restrictions placed on their use and distribution."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:240
+msgid ""
+"Any number of sources can be added, the setup script will continue to prompt "
+"until you have specified all that you want."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:247
+msgid ""
+"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+"available list by selecting [U]pdate from the menu. This is a super-set of "
+"<tt>apt-get update</tt> that makes the fetched information available to "
+"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
+"tt> has been run before."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:253
+msgid ""
+"You can then go on and make your selections using [S]elect and then perform "
+"the installation using [I]nstall. When using the APT method the [C]onfig and "
+"[R]emove commands have no meaning, the [I]nstall command performs both of "
+"them together."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:258
+msgid ""
+"By default APT will automatically remove the package (.deb) files once they "
+"have been successfully installed. To change this behavior place <tt>Dselect::"
+"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:264
+msgid "The Interface"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:278
+msgid ""
+"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
+"same interface. It is a simple system that generally tells you what it will "
+"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
+"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
+"actually provides more functionality than is present in <prgn>apt-get</prgn> "
+"alone.</p></footnote> After printing out a summary of what will happen APT "
+"then will print out some informative status messages so that you can "
+"estimate how far along it is and how much is left to do."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:280
+msgid "Startup"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:284
+msgid ""
+"Before all operations except update, APT performs a number of actions to "
+"prepare its internal state. It also does some checks of the system's state. "
+"At any time these operations can be performed by running <tt>apt-get check</"
+"tt>."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:289
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:297
+msgid ""
+"The first thing it does is read all the package files into memory. APT uses "
+"a caching scheme so this operation will be faster the second time it is run. "
+"If some of the package files are not found then they will be ignored and a "
+"warning will be printed when apt-get exits."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:303
+msgid ""
+"The final operation performs a detailed analysis of the system's "
+"dependencies. It checks every dependency of every installed or unpacked "
+"package and considers if it is OK. Should this find a problem then a report "
+"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:320
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done\n"
+"You might want to run apt-get -f install' to correct these.\n"
+"Sorry, but the following packages have unmet dependencies:\n"
+" 9fonts: Depends: xlib6g but it is not installed\n"
+" uucp: Depends: mailx but it is not installed\n"
+" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" adduser: Depends: perl-base but it is not installed\n"
+" aumix: Depends: libgpmg1 but it is not installed\n"
+" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 but it is not installed\n"
+" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:329
+msgid ""
+"In this example the system has many problems, including a serious problem "
+"with libreadlineg2. For each package that has unmet dependencies a line is "
+"printed out indicating the package with the problem and the dependencies "
+"that are unmet. A short explanation of why the package has a dependency "
+"problem is also included."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:337
+msgid ""
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
+"packages when performing upgrades. <footnote><p>APT however considers all "
+"known dependencies and attempts to prevent broken packages</p></footnote>. "
+"The second is if a package installation fails during an operation. In this "
+"situation a package may have been unpacked without its dependents being "
+"installed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:345
+msgid ""
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
+"deduce a possible solution to the problem and then continue on. The APT "
+"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
+"for easy continuation of failed maintainer scripts."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:351
+msgid ""
+"However, if the <tt>-f</tt> option is used to correct a seriously broken "
+"system caused by the first case then it is possible that it will either fail "
+"immediately or the installation sequence will fail. In either case it is "
+"necessary to manually use dpkg (possibly with forcing options) to correct "
+"the situation enough to allow APT to proceed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:356
+msgid "The Status Report"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:363
+msgid ""
+"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
+"happen. Generally the report reflects the type of operation being performed "
+"but there are several common elements. In all cases the lists reflect the "
+"final state of things, taking into account the <tt>-f</tt> option and any "
+"other relevant activities to the command being executed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:364
+msgid "The Extra Package list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:372
+#, no-wrap
+msgid ""
+"The following extra packages will be installed:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:379
+msgid ""
+"The Extra Package list shows all of the packages that will be installed or "
+"upgraded in excess of the ones mentioned on the command line. It is only "
+"generated for an <tt>install</tt> command. The listed packages are often the "
+"result of an Auto Install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:382
+msgid "The Packages to Remove"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:389
+#, no-wrap
+msgid ""
+"The following packages will be REMOVED:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:399
+msgid ""
+"The Packages to Remove list shows all of the packages that will be removed "
+"from the system. It can be shown for any of the operations and should be "
+"given a careful inspection to ensure nothing important is to be taken off. "
+"The <tt>-f</tt> option is especially good at generating packages to remove "
+"so extreme care should be used in that case. The list may contain packages "
+"that are going to be removed because they are only partially installed, "
+"possibly due to an aborted installation."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:402
+msgid "The New Packages list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:406
+#, no-wrap
+msgid ""
+"The following NEW packages will installed:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:411
+msgid ""
+"The New Packages list is simply a reminder of what will happen. The packages "
+"listed are not presently installed in the system but will be when APT is "
+"done."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:414
+msgid "The Kept Back list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:419
+#, no-wrap
+msgid ""
+"The following packages have been kept back\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:428
+msgid ""
+"Whenever the whole system is being upgraded there is the possibility that "
+"new versions of packages cannot be installed because they require new things "
+"or conflict with already installed things. In this case the package will "
+"appear in the Kept Back list. The best way to convince packages listed there "
+"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
+"to resolve their problems."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:431
+msgid "Held Packages warning"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:435
+#, no-wrap
+msgid ""
+"The following held packages will be changed:\n"
+" cvs"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:441
+msgid ""
+"Sometimes you can ask APT to install a package that is on hold, in such a "
+"case it prints out a warning that the held package is going to be changed. "
+"This should only happen during dist-upgrade or install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:444
+msgid "Final summary"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:447
+msgid ""
+"Finally, APT will print out a summary of all the changes that will occur."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:452
+#, no-wrap
+msgid ""
+"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
+"12 packages not fully installed or removed.\n"
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:470
+msgid ""
+"The first line of the summary simply is a reduced version of all of the "
+"lists and includes the number of upgrades - that is packages already "
+"installed that have new versions available. The second line indicates the "
+"number of poorly configured packages, possibly the result of an aborted "
+"installation. The final line shows the space requirements that the "
+"installation needs. The first pair of numbers refer to the size of the "
+"archive files. The first number indicates the number of bytes that must be "
+"fetched from remote locations and the second indicates the total size of all "
+"the archives required. The next number indicates the size difference between "
+"the presently installed packages and the newly installed packages. It is "
+"roughly equivalent to the space required in /usr after everything is done. "
+"If a large number of packages are being removed then the value may indicate "
+"the amount of space that will be freed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:473
+msgid ""
+"Some other reports can be generated by using the -u option to show packages "
+"to upgrade, they are similar to the previous examples."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:477
+msgid "The Status Display"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:481
+msgid ""
+"During the download of archives and package files APT prints out a series of "
+"status messages."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:490
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:500
+msgid ""
+"The lines starting with <em>Get</em> are printed out when APT begins to "
+"fetch a file while the last line indicates the progress of the download. The "
+"first percent value on the progress line indicates the total percent done of "
+"all files. Unfortunately since the size of the Package files is unknown "
+"<tt>apt-get update</tt> estimates the percent done which causes some "
+"inaccuracies."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:509
+msgid ""
+"The next section of the status line is repeated once for each download "
+"thread and indicates the operation being performed and some useful "
+"information about what is happening. Sometimes this section will simply read "
+"<em>Forking</em> which means the OS is loading the download module. The "
+"first word after the [ is the fetch number as shown on the history lines. "
+"The next word is the short form name of the object being downloaded. For "
+"archives it will contain the name of the package that is being fetched."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:524
+msgid ""
+"Inside of the single quote is an informative string indicating the progress "
+"of the negotiation phase of the download. Typically it progresses from "
+"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
+"<em>Resuming</em>. The final value is the number of bytes downloaded from "
+"the remote site. Once the download begins this is represented as "
+"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
+"kilobytes is expected. The total size is always shown in 4 figure notation "
+"to preserve space. After the size display is a percent meter for the file "
+"itself. The second last element is the instantaneous average speed. This "
+"values is updated every 5 seconds and reflects the rate of data transfer for "
+"that period. Finally is shown the estimated transfer time. This is updated "
+"regularly and reflects the time to complete everything at the shown transfer "
+"rate."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:530
+msgid ""
+"The status display updates every half second to provide a constant feedback "
+"on the download progress while the Get lines scroll back whenever a new file "
+"is started. Since the status display is constantly updated it is unsuitable "
+"for logging to a file, use the <tt>-q</tt> option to remove the status "
+"display."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:535
+msgid "Dpkg"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:542
+msgid ""
+"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
+"to the <prgn>dpkg</prgn> interface once downloading is completed. "
+"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
+"packages and the packages themselves may also ask several questions. Before "
+"each question there is usually a description of what it is asking and the "
+"questions are too varied to discuss completely here."
+msgstr ""
+
+#. type: <title></title>
+#: offline.sgml:4
+msgid "Using APT Offline"
+msgstr ""
+
+#. type: <version></version>
+#: offline.sgml:7
+msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: offline.sgml:12
+msgid ""
+"This document describes how to use APT in a non-networked environment, "
+"specifically a 'sneaker-net' approach for performing upgrades."
+msgstr ""
+
+#. type: <copyrightsummary></copyrightsummary>
+#: offline.sgml:16
+msgid "Copyright &copy; Jason Gunthorpe, 1999."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:32
+msgid "Introduction"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#, fuzzy
+#| msgid "OverrideDir"
+msgid "Overview"
+msgstr "OverrideDir"
+
+#. type: <p></p>
+#: offline.sgml:40
+msgid ""
+"Normally APT requires direct access to a Debian archive, either from a local "
+"media or through a network. Another common complaint is that a Debian "
+"machine is on a slow link, such as a modem and another machine has a very "
+"fast connection but they are physically distant."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:51
+msgid ""
+"The solution to this is to use large removable media such as a Zip disc or a "
+"SuperDisk disc. These discs are not large enough to store the entire Debian "
+"archive but can easily fit a subset large enough for most users. The idea is "
+"to use APT to generate a list of packages that are required and then fetch "
+"them onto the disc using another machine with good connectivity. It is even "
+"possible to use another Debian machine with APT or to use a completely "
+"different OS and a download tool like wget. Let <em>remote host</em> mean "
+"the machine downloading the packages, and <em>target host</em> the one with "
+"bad or no connection."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:57
+msgid ""
+"This is achieved by creatively manipulating the APT configuration file. The "
+"essential premis to tell APT to look on a disc for it's archive files. Note "
+"that the disc should be formated with a filesystem that can handle long file "
+"names such as ext2, fat32 or vfat."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:63
+msgid "Using APT on both machines"
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:71
+msgid ""
+"APT being available on both machines gives the simplest configuration. The "
+"basic idea is to place a copy of the status file on the disc and use the "
+"remote machine to fetch the latest package files and decide which packages "
+"to download. The disk directory structure should look like:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:80
+#, no-wrap
+msgid ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:88
+#, fuzzy
+#| msgid "User configuration"
+msgid "The configuration file"
+msgstr "Benutzerkonfiguration"
+
+#. type: <p></p>
+#: offline.sgml:96
+msgid ""
+"The configuration file should tell APT to store its files on the disc and to "
+"use the configuration files on the disc as well. The sources.list should "
+"contain the proper sites that you wish to use from the remote machine, and "
+"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
+"<em>target host</em>. Please note, if you are using a local archive you must "
+"use copy URIs, the syntax is identical to file URIs."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:100
+msgid ""
+"<em>apt.conf</em> must contain the necessary information to make APT use the "
+"disc:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:124
+#, no-wrap
+msgid ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it tells\n"
+" the remote APT what architecture the target machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:129
+msgid ""
+"More details can be seen by examining the apt.conf man page and the sample "
+"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:136
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy <em>/"
+"var/lib/dpkg/status</em> to it. You will also need to create the directories "
+"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
+"em> Then take the disc to the remote machine and configure the sources.list. "
+"On the remote machine execute the following:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:142
+#, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT fetches the package files ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT fetches all the packages needed to upgrade the target machine ]"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:149
+msgid ""
+"The dist-upgrade command can be replaced with any-other standard APT "
+"commands, particularly dselect-upgrade. You can even use an APT front end "
+"such as <em>dselect</em> However this presents a problem in communicating "
+"your selections back to the local computer."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:153
+msgid ""
+"Now the disc contains all of the index files and archives needed to upgrade "
+"the target machine. Take the disc back and run:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:159
+#, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT generates a local copy of the cache files ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Or any other APT command ]"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:165
+msgid ""
+"It is necessary for proper function to re-specify the status file to be the "
+"local one. This is very important!"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:172
+msgid ""
+"If you are using dselect you can do the very risky operation of copying disc/"
+"status to /var/lib/dpkg/status so that any selections you made on the remote "
+"machine are updated. I highly recommend that people only make selections on "
+"the local machine - but this may not always be possible. DO NOT copy the "
+"status file if dpkg or APT have been run in the mean time!!"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:178
+msgid "Using APT and wget"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:185
+msgid ""
+"<em>wget</em> is a popular and portable download tool that can run on nearly "
+"any machine. Unlike the method above this requires that the Debian machine "
+"already has a list of available packages."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:190
+msgid ""
+"The basic idea is to create a disc that has only the archive files "
+"downloaded from the remote site. This is done by using the --print-uris "
+"option to apt-get and then preparing a wget script to actually fetch the "
+"packages."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:196
+#, fuzzy
+#| msgid "Options"
+msgid "Operation"
+msgstr "Optionen"
+
+#. type: <p><example>
+#: offline.sgml:200
+msgid ""
+"Unlike the previous technique no special configuration files are required. "
+"We merely use the standard APT commands to generate the file list."
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:205
+#, no-wrap
+msgid ""
+" # apt-get dist-upgrade \n"
+" [ Press no when prompted, make sure you are happy with the actions ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:210
+msgid ""
+"Any command other than dist-upgrade could be used here, including dselect-"
+"upgrade."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:216
+msgid ""
+"The /disc/wget-script file will now contain a list of wget commands to "
+"execute in order to fetch the necessary archives. This script should be run "
+"with the current directory as the disc's mount point so as to save the "
+"output on the disc."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:219
+msgid "The remote machine would do something like"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:223
+#, no-wrap
+msgid ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ wait.. ]"
+msgstr ""
+
+#. type: </example><example>
+#: offline.sgml:228
+msgid ""
+"Once the archives are downloaded and the disc returned to the Debian machine "
+"installation can proceed using,"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:230
+#, no-wrap
+msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:234
+msgid "Which will use the already fetched archives on the disc."
+msgstr ""
+
+#~ msgid ""
+#~ "Disable Immediate Configuration; This dangerous option disables some of "
+#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+#~ "necessary on some extremely slow single user systems but is very "
+#~ "dangerous and may cause package install scripts to fail or worse. Use at "
+#~ "your own risk."
+#~ msgstr ""
+#~ "Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet "
+#~ "einigen Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener "
+#~ "aufzurufen. Dies zu tun, könnte auf besonders langsamen "
+#~ "Einzelbenutzersystemen nötig sein, ist aber gefährlich und könnte "
+#~ "Paketinstallationsskripte zum Scheitern oder schlimmeren veranlassen. "
+#~ "Benutzen Sie es auf eigene Gefahr."
diff --git a/doc/po/es.po b/doc/po/es.po
index 266f69c02..ed7ca3d8f 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-11-27 00:18+0100\n"
"PO-Revision-Date: 2004-09-20 17:05+0000\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: <debian-l10n-spanish@lists.debian.org>\n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index cab40fc9d..6aa64d20a 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2009-12-01 19:13+0100\n"
-"PO-Revision-Date: 2009-09-26 19:25+0200\n"
+"PO-Revision-Date: 2009-12-16 07:51+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -359,16 +359,22 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
#, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -407,48 +413,66 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
#, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:108
#, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:114
#, no-wrap
+#| msgid ""
+#| "<!ENTITY dselect \"<citerefentry>\n"
+#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -672,6 +696,7 @@ msgstr ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
" <othername>Équipe de développement d'APT</othername>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
@@ -1055,10 +1080,10 @@ msgstr ""
" </varlistentry>\n"
"\">\n"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
-#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
"February 2004</date>"
@@ -1354,10 +1379,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
+#| msgid ""
+#| "<literal>Missing</literal> is the number of package names that were "
+#| "referenced in a dependency but were not provided by any package. Missing "
+#| "packages may be in evidence if a full distribution is not accessed, or if "
+#| "a package (real or virtual) has been dropped from the distribution. "
+#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be in evidence if a full distribution is not accessed, or if a "
+"packages may be an evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1365,7 +1396,7 @@ msgstr ""
"dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants "
"peuvent être mis en évidence quand on n'accède pas à une distribution "
"complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. "
-"Habituellement on les trouve dans les champs « Conflicts »."
+"Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:159
@@ -1553,7 +1584,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
-#, fuzzy
+#| msgid ""
+#| "Note that a package which APT knows of is not nessasarily available to "
+#| "download, installable or installed, e.g. virtual packages are also listed "
+#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1561,7 +1595,7 @@ msgid ""
msgstr ""
"Veuillez noter qu'un paquet connu par APT n'est pas forcément disponible, "
"installable ou installé. Par exemple, les paquets virtuels sont également "
-"affichés dans la liste."
+"affichés dans la liste créée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:239
@@ -1673,7 +1707,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
msgid "options"
msgstr "options"
@@ -1912,14 +1946,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:973 apt_preferences.5.xml:615
+#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
msgid "Files"
msgstr "Fichiers"
@@ -1930,10 +1964,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 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:979 apt_preferences.5.xml:622
-#: sources.list.5.xml:221
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -1944,7 +1978,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostique"
@@ -2324,7 +2358,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2414,13 +2448,16 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
+#| msgid ""
+#| "Temporary directory in which to write extracted debconf template files "
+#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
+#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
-"literal>"
+"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
+"TempDir</literal>"
msgstr ""
-"Répertoire temporaire dans lequel écrire les scripts et guides de "
-"configuration pour Debconf. Élément de configuration : <literal>APT::"
+"Répertoire temporaire dans lequel écrire les scripts de configuration et modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::"
"ExtractTemplates::TempDir</literal>."
#. type: Content of: <refentry><refsect1><para>
@@ -2432,6 +2469,17 @@ msgstr ""
"<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
"le nombre 100 en cas d'erreur."
+#. The last update date
+#. type: Content of: <refentry><refentryinfo>
+#: apt-ftparchive.1.xml:13
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
+#| "November 2007</date>"
+msgid ""
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"August 2009</date>"
+msgstr "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>17 août 2009</date>"
+
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
msgid "apt-ftparchive"
@@ -2546,8 +2594,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
-msgid ""
-"The option <option>--db</option> can be used to specify a binary caching DB."
+msgid "The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
"On peut se servir de l'option <option>--db</option> pour demander un cache "
"binaire."
@@ -2702,10 +2749,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:155
-msgid ""
-"The generate configuration has 4 separate sections, each described below."
-msgstr ""
-"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
+msgid "The generate configuration has 4 separate sections, each described below."
+msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:157
@@ -2714,11 +2759,16 @@ msgstr "La section Dir"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
+#| msgid ""
+#| "The <literal>Dir</literal> section defines the standard directories "
+#| "needed to locate the files required during the generation process. These "
+#| "directories are prepended to certain relative paths defined in later "
+#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended to certain relative paths defined in later "
-"sections to produce a complete an absolute path."
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
msgstr ""
"La section <literal>Dir</literal> définit les répertoires standards où "
"situer les fichiers nécessaires au processus de création. Ces répertoires "
@@ -3518,20 +3568,40 @@ msgstr ""
"N'autoriser que la lecture pour les bases de données de cache. Élément de "
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:547
+#| msgid "<option>--version</option>"
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+msgid ""
+"This configuration option defaults to \"<literal>true</literal>\" and should "
+"only be set to <literal>\"false\"</literal> if the Archive generated with "
+"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
+"that it is currently not possible to create these files with <command>apt-"
+"ftparchive</command>."
+msgstr ""
+"Cette option de configuration a « <literal>true</literal> » comme valeur par défaut et ne devrait être placée sur « <literal>false</literal> » que si l'archive créée avec "
+"&apt-ftparchive; fournit également des fichiers <filename>Translation</filename>. Veuillez noter qu'il n'est actuellement pas possible de créer ces fichiers avec <command>"
+"apt-"
+"ftparchive</command>."
+
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462
-#: sources.list.5.xml:181
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:567
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:563
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3540,7 +3610,7 @@ msgstr ""
"paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:577
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3548,7 +3618,7 @@ msgstr ""
"<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
"nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-get.8.xml:13
msgid ""
@@ -3558,8 +3628,8 @@ msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
"Novembre 2008</date>"
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:29
+#. type: <heading></heading>
+#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
msgid "apt-get"
msgstr "apt-get"
@@ -3678,8 +3748,8 @@ msgstr ""
"progression d'ensemble peut être imprécis puisque la taille de ces fichiers "
"ne peut être connue à l'avance."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:147
+#. type: <tag></tag>
+#: apt-get.8.xml:147 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
@@ -3732,8 +3802,8 @@ msgstr ""
"état (par exemple, suppression d'anciens paquets, installation de nouveaux "
"paquets)."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:170
+#. type: <tag></tag>
+#: apt-get.8.xml:170 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
@@ -3760,8 +3830,8 @@ msgstr ""
"sources où récupérer les paquets désirés. Voyez aussi &apt-preferences; pour "
"un mécanisme de remplacement des paramètres généraux pour certains paquets."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:183
+#. type: <tag></tag>
+#: apt-get.8.xml:183 guide.sgml:131
msgid "install"
msgstr "install"
@@ -3914,7 +3984,14 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
-#, fuzzy
+#| msgid ""
+#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
+#| "source packages. APT will examine the available packages to decide which "
+#| "source package to fetch. It will then find and download into the current "
+#| "directory the newest available version of that source package while "
+#| "respect the default release, set with the option <literal>APT::Default-"
+#| "Release</literal>, the <option>-t</option> option or per package with "
+#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3934,7 +4011,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:259
-#, fuzzy
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3943,15 +4019,14 @@ msgid ""
"none) source version than the one you have installed or could install."
msgstr ""
"Les paquets source sont gérés indépendamment des paquets binaires, via les "
-"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On "
-"n'obtiendra probablement pas les mêmes sources que celles du paquet installé "
-"ou celles du paquet qu'on pourrait installer."
+"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il est donc nécessaire d'ajouter une telle ligne pour chaque dépôt pour lequel vous souhaitez "
+"pouvoir obtenir les sources. Dans le cas contraite, vous risquez de ne pas obtenir les mêmes sources que celles du paquet installé "
+"ou celles du paquet installable."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
-#, fuzzy
msgid ""
-"If the <option>--compile</option> options is specified then the package will "
+"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -4228,7 +4303,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
-#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatical. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true) Neigther "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4248,11 +4330,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages with and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages with and empty set of square brackets meaning "
-"breaks that are of no consequence (rare)."
+"indicate broken packages and empty set of square brackets meaning breaks "
+"that are of no consequence (rare)."
msgstr ""
"La simulation affiche une série de lignes représentant chacune une opération "
"de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets "
@@ -4681,6 +4768,8 @@ msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:570
@@ -4855,8 +4944,7 @@ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:141
msgid "Keyring of local trusted keys, new keys will be added here."
-msgstr ""
-"Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
+msgstr "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:144
@@ -4880,10 +4968,8 @@ msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:152
-msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
-msgstr ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:153
@@ -4895,16 +4981,18 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
-#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
+#| "November 2007</date>"
msgid ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"Novembre 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"août 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-mark.8.xml:22 apt-mark.8.xml:29
@@ -4918,7 +5006,11 @@ msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
-#, fuzzy
+#| msgid ""
+#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
+#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
+#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
+#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -4927,10 +5019,12 @@ msgid ""
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
-"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"req"
-"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquet</replaceable></arg>"
+" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
+"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain"
+"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg> </"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:53
@@ -4943,7 +5037,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
-#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed. Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4953,7 +5052,7 @@ msgid ""
msgstr ""
"Lorsque l'installation d'un paquet est demandée et que d'autres paquets dont "
"il dépend sont installés, ces paquets sont marqués comme ayant été "
-"automatiquement installés. De tels paquets sont supprimés dès que plus aucun "
+"automatiquement installés. De tels paquets sont supprimés par <command>apt-get</command> ou <command>aptitude</command> dès que plus aucun "
"paquet, installé manuellement, qui dépend d'eux ne subsiste sur le système."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4991,47 +5090,52 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:81
msgid "showauto"
-msgstr ""
+msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
-"<literal>showauto</literal> is used to print a list of manually installed "
-"packages with each package on a new line."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
-"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
-"installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
-"ne sont plus nécessaires."
+"<literal>showauto</literal>, affiche les paquets "
+"installés manuellement, un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
-#, fuzzy
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr "<option>-f=<filename>FICHIER</filename></option>"
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
-#, fuzzy
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
-msgstr "<option>--file=<filename>FICHIER</filename></option>"
+msgstr ""
+"<option>--file=<filename><replaceable>FICHIER</replaceable></filename></"
+"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
-#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
+#| "the default location, which is <filename>extended_status</filename> in "
+#| "the directory defined by the Configuration Item: <literal>Dir::State</"
+#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
-"Lire/écrire les statistiques sur les paquets depuis <filename>FICHIER</"
+"Lire/écrire les statistiques sur les paquets depuis <filename><replaceable>FICHIER</replaceable></"
"filename> au lieu de l'emplacement par défaut (<filename>extended_status</"
"filename> dans le répertoire défini par l'option de configuration "
-"<literal>Dir::State</literal>."
+"<literal>Dir::State</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:103
@@ -5065,9 +5169,9 @@ msgstr "Afficher la version du programme."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:124
-#, fuzzy
+#| msgid "<filename>/etc/apt/preferences</filename>"
msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
+msgstr "<filename>/var/lib/apt/extended_states</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:125
@@ -5076,12 +5180,14 @@ msgid ""
"State</literal> sets the path to the <filename>extended_states</filename> "
"file."
msgstr ""
+"Liste d'état des paquets auto-installés. L'élément de configuration <literal>Dir::"
+"State</literal> définit le chemin d'accès au fichier <filename>extended_states</filename>."
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:134
-#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
+msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:138
@@ -5147,12 +5253,19 @@ msgstr "Trusted archives"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "different steps. <command>apt-secure</command> is the last step in this "
+#| "chain, trusting an archive does not mean that the packages that you trust "
+#| "it do not contain malicious code but means that you trust the archive "
+#| "maintainer. Its the archive maintainer responsibility to ensure that the "
+#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. Its the archive maintainer responsibility to ensure that the "
+"maintainer. It's the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
"D'une archive apt jusqu'à l'utilisateur, la confiance se construit en "
@@ -5195,19 +5308,27 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sum of all of the packages "
+#| "files are then computed and put into the Release file. The Release file "
+#| "is then signed by the archive key (which is created once a year and "
+#| "distributed through the FTP server. This key is also on the Debian "
+#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year and distributed through the "
-"FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year) and distributed through "
+"the FTP server. This key is also on the Debian keyring."
msgstr ""
-"Une fois le paquet vérifié et archivé, la signature du responsable est "
+"Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la signature du responsable est "
"enlevée, une somme MD5 du paquet est calculée et mise dans le fichier "
"Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise "
"dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette "
-"clé qui est créée chaque année et distribuée par le serveur FTP se trouve "
+"clé, qui est recréée chaque année, est distribuée par le serveur FTP. Elle se trouve "
"aussi dans le trousseau Debian."
#. type: Content of: <refentry><refsect1><para>
@@ -5242,7 +5363,7 @@ msgid ""
"element (router, switch, etc.) or by redirecting traffic to a rogue server "
"(through arp or DNS spoofing attacks)."
msgstr ""
-"<literal>Attaque réseau de type « homme au milieu »</literal>. "
+"<literal>Attaque réseau de type <quote>homme au milieu</quote></literal>. "
"Sans vérification de signature, quelqu'un de malveillant peut s'introduire "
"au milieu du processus de téléchargement et insérer du code soit en "
"contrôlant un élément du réseau, routeur, commutateur, etc. soit en "
@@ -5323,32 +5444,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
+#| msgid ""
+#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
+#| "already. You can do this by running <command>apt-ftparchive release</"
+#| "command> (provided in apt-utils)."
msgid ""
-"<literal>Create a toplevel Release file</literal>. if it does not exist "
+"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
-"<literal>créer un fichier Release à la racine de l'archive</literal>, s'il "
+"<emphasis>créer un fichier Release à la racine de l'archive</emphasis>, s'il "
"n'existe pas déjà. Vous pouvez le créer avec la commande <command>apt-"
-"ftparchive release</command> (fournie dans le paquet apt-utils) ;"
+"ftparchive release</command> (fournie dans le paquet apt-utils)."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
+#| msgid ""
+#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
+#| "o Release.gpg Release</command>."
msgid ""
-"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
+"o Release.gpg Release</command>."
msgstr ""
-"<literal>le signer</literal>, avec la commande <command>gpg -abs -o Release."
-"gpg Release</command> ;"
+"<emphasis>le signer</emphasis>, avec la commande <command>gpg -abs -o Release."
+"gpg Release</command>."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
+#| msgid ""
+#| "<literal>Publish the key fingerprint</literal>, that way your users will "
+#| "know what key they need to import in order to authenticate the files in "
+#| "the archive."
msgid ""
-"<literal>Publish the key fingerprint</literal>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
-"<literal>publier l'empreinte de la clé</literal>. Ainsi les utilisateurs de "
+"<emphasis>publier l'empreinte de la clé</emphasis>. Ainsi les utilisateurs de "
"votre archive connaîtront la clé qu'ils doivent importer pour authentifier "
"les fichiers de l'archive."
@@ -5468,10 +5600,14 @@ msgstr ""
"<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
"en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
-#, fuzzy
+#| msgid ""
+#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+#| "email; &apt-product; <date>10 December 2008</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5481,7 +5617,7 @@ msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>10 décembre 2008</date>"
+"&apt-product; <date>18 septembre 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt.conf.5.xml:28 apt.conf.5.xml:35
@@ -5525,11 +5661,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:50
+#| msgid ""
+#| "The configuration file is organized in a tree with options organized into "
+#| "functional groups. option specification is given with a double colon "
+#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
+#| "option within the APT tool group, for the Get tool. options do not "
+#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. option specification is given with a double colon "
+"functional groups. Option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. options do not inherit from "
+"within the APT tool group, for the Get tool. Options do not inherit from "
"their parent groups."
msgstr ""
"Le fichier de configuration est construit comme un arbre d'options "
@@ -5540,13 +5682,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:56
-#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal> The trailing semicolon is required and the quotes are "
+#| "optional. A new scope can be opened with curly braces, like:"
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
"treated as comments (ignored), as well as all text between <literal>/*</"
"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing "
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
"semicolon and the quotes are required. The value must be on one line, and "
"there is no kind of string concatenation. It must not include inside "
"quotes. The behavior of the backslash \"\\\" and escaped characters inside "
@@ -5561,7 +5710,9 @@ msgstr ""
"literal> et <literal>*/</literal>, tout comme les commentaires C/C++. "
"Chaque ligne est de la forme : <literal>APT::Get::Assume-Yes \"true\";</"
"literal> Le point-virgule final est obligatoire et les guillemets sont "
-"optionnels. On peut déclarer un nouveau champ d'action avec des accolades, "
+"optionnels. La valeur doit tenir sur une seule ligne et il n'existe pas de fusion de chaînes. Elle ne doit pas comporter de guillemets . Le comportement du caractère "
+"barre oblique inversée \"\\\" et les caractères utilisés avec séquence d'échappement dans ue valeur ne sont pas déterministes et devraient être évités. Le nom d'une option "
+"peut contenir des caractères alphanumériques et « /-:._+ ». On peut déclarer un nouveau champ d'action avec des accolades, "
"comme suit :"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -5628,10 +5779,20 @@ msgid ""
"list. If you specify a name you can override the option as every other "
"option by reassigning a new value to the option."
msgstr ""
+"Les noms des éléments de configuration sont optionnels si une liste est définie, comme cela peut se voir avec l'exemple <literal>DPkg::Pre-Install-Pkgs</literal> précédent."
+" Si vous n'indiquez pas de nom, une nouvelle entrée ajoutera une nouvelle option à la liste. Dans le cas contraire, l'option correspondante peut être remplacée, comme "
+"toute autre option, en lui réaffectant une valeur."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:98
#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> and "
+#| "<literal>#clear</literal> <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included. <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendents are "
+#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5661,6 +5822,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:111
#, fuzzy
+#| msgid ""
+#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "configuration directive to be specified on the command line. The syntax "
+#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+#| "instance) followed by an equals sign then the new value of the option. "
+#| "Lists can be appended too by adding a trailing :: to the list name."
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -5783,26 +5950,43 @@ msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Disable Immediate Configuration; This dangerous option disables some of "
-"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-"necessary on some extremely slow single user systems but is very dangerous "
-"and may cause package install scripts to fail or worse. Use at your own "
-"risk."
+"Defaults to on which will cause APT to install essential and important "
+"packages as fast as possible in the install/upgrade operation. This is done "
+"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
+"does treat an important package in the same way as an extra package: Between "
+"the unpacking of the important package A and his configuration can then be "
+"many other unpack or configuration calls, e.g. for package B which has no "
+"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
+"script of package B generates an error) which results in a system state in "
+"which package A is unpacked but unconfigured - each package depending on A "
+"is now no longer guaranteed to work as their dependency on A is not longer "
+"satisfied. The immediate configuration marker is also applied to all "
+"dependencies which can generate a problem if the dependencies e.g. form a "
+"circle as a dependency with the immediate flag is comparable with a Pre-"
+"Dependency. So in theory it is possible that APT encounters a situation in "
+"which it is unable to perform immediate configuration, error out and refers "
+"to this option so the user can deactivate the immediate configuration "
+"temporary to be able to perform an install/upgrade again. Note the use of "
+"the word \"theory\" here as this problem was only encountered by now in real "
+"world a few times in non-stable distribution versions and caused by wrong "
+"dependencies of the package in question or by a system in an already broken "
+"state, so you should not blindly disable this option as the mentioned "
+"scenario above is not the only problem immediate configuration can help to "
+"prevent in the first place. Before a big operation like <literal>dist-"
+"upgrade</literal> is run with this option disabled it should be tried to "
+"explicitly <literal>install</literal> the package APT is unable to configure "
+"immediately, but please make sure to report your problem also to your "
+"distribution and to the APT team with the buglink below so they can work on "
+"improving or correcting the upgrade process."
msgstr ""
-"Désactive la configuration immédiate ; cette dangereuse option désactive une "
-"partie du code de mise en ordre de APT pour que ce dernier effectue le moins "
-"d'appels possible à &dpkg;. Ça peut être nécessaire sur des systèmes à un "
-"seul utilisateur extrêmement lents, mais cette option est très dangereuse et "
-"peut faire échouer les scripts d'installation, voire pire. Utilisez-la à "
-"vos risques et périls."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:181
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:182
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5820,12 +6004,12 @@ msgstr ""
"ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:190
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:191
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -5835,24 +6019,24 @@ msgstr ""
"mémoire allouée pour le chargement de ce cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:195
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:196
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:199
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:200
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5862,12 +6046,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:189
+#: apt.conf.5.xml:204
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:205
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5877,12 +6061,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:194
+#: apt.conf.5.xml:209
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:210
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5892,17 +6076,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:216
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:221
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:222
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -5912,12 +6096,12 @@ msgstr ""
"télécharger entièrement. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:227
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:213
+#: apt.conf.5.xml:228
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -5933,12 +6117,12 @@ msgstr ""
"initiée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:235
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:236
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -5948,12 +6132,12 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:240
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:226
+#: apt.conf.5.xml:241
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -5963,13 +6147,20 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:230 sources.list.5.xml:139
+#: apt.conf.5.xml:245 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:246
#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
+#| "environment variable will override all settings."
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -5988,7 +6179,7 @@ msgstr ""
"les options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:239
+#: apt.conf.5.xml:254
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6013,7 +6204,7 @@ msgstr ""
"en compte aucune de ces options."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:249 apt.conf.5.xml:306
+#: apt.conf.5.xml:264 apt.conf.5.xml:328
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6023,10 +6214,19 @@ msgstr ""
"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:252
+#: apt.conf.5.xml:267
+#, fuzzy
+#| msgid ""
+#| "One setting is provided to control the pipeline depth in cases where the "
+#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+#| "5 indicating how many outstanding requests APT should send. A value of "
+#| "zero MUST be specified if the remote host does not properly linger on TCP "
+#| "connections - otherwise data corruption will occur. Hosts which require "
+#| "this are in violation of RFC 2068."
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -6043,7 +6243,7 @@ msgstr ""
"option ne respectent pas la RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:275
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6052,16 +6252,31 @@ msgid ""
"multiple servers at the same time.)"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:266
+#: apt.conf.5.xml:286
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-msgid ""
-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
+#: apt.conf.5.xml:287
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control and proxy options are the same as for "
+#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
+#| "is not supported yet."
+msgid ""
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
"URI HTTPS. Les options de contrôle de cache et de mandataire (proxy) sont "
@@ -6069,7 +6284,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> n'est pas encore supportée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:271
+#: apt.conf.5.xml:293
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6101,13 +6316,25 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:150
+#: apt.conf.5.xml:311 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:290
+#: apt.conf.5.xml:312
#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
+#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
+#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6142,7 +6369,7 @@ msgstr ""
"respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:309
+#: apt.conf.5.xml:331
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6159,7 +6386,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:338
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6174,7 +6401,7 @@ msgstr ""
"de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:321
+#: apt.conf.5.xml:343
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6190,18 +6417,19 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:328 sources.list.5.xml:132
+#: apt.conf.5.xml:350 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:356
#, fuzzy, no-wrap
+#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:351
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6223,12 +6451,12 @@ msgstr ""
"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:361
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340
+#: apt.conf.5.xml:362
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6239,18 +6467,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:367
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:373
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:368
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6262,19 +6490,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:381
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:374
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6291,13 +6519,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:385
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:383
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6312,7 +6540,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:390
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6321,8 +6549,55 @@ msgid ""
"prefer uncompressed files to support the usage of local mirrors."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:396
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:397
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the Description-"
+"Translations. APT will try to display the first available Description for "
+"the Language which is listed at first. Languages can be defined with their "
+"short or long Languagecodes. Note that not all archives provide "
+"<filename>Translation</filename> files for every Language - especially the "
+"long Languagecodes are rare, so please inform you which ones are available "
+"before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:413
+#, no-wrap
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+msgid ""
+"The default list includes \"environment\" and \"en\". "
+"\"<literal>environment</literal>\" has a special meaning here: It will be "
+"replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used. To "
+"force apt to use no Translation file use the setting <literal>Acquire::"
+"Languages=none</literal>. \"<literal>none</literal>\" is another special "
+"meaning code which will stop the search for a fitting <filename>Translation</"
+"filename> file. This can be used by the system administrator to let APT "
+"know that it should download also this files without actually use them if "
+"not the environment specifies this languages. So the following example "
+"configuration will result in the order \"en, de\" in an english and in \"de, "
+"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
+"if APT is not used in a french localization, in such an environment the "
+"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
+"\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:217
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6332,12 +6607,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:420
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:422
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6357,7 +6632,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:429
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6380,7 +6655,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:438
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6395,7 +6670,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:444
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6406,8 +6681,15 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:448
#, fuzzy
+#| msgid ""
+#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
+#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
+#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
+#| "location of the respective programs."
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6424,7 +6706,7 @@ msgstr ""
"l'emplacement des programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:456
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6446,12 +6728,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:469
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:471
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6462,12 +6744,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:475
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:476
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6485,7 +6767,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:485
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6494,12 +6776,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:489
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:490
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6508,12 +6790,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:451
+#: apt.conf.5.xml:494
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:495
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6523,12 +6805,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:501
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:502
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6537,7 +6819,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:507
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6548,17 +6830,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:513
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6571,12 +6853,12 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:519
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:477
+#: apt.conf.5.xml:520
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6592,7 +6874,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:526
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6608,12 +6890,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:533
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:534
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6622,12 +6904,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:538
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:539
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6637,12 +6919,12 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:544
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:545
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 "
@@ -6657,7 +6939,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:560
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6667,7 +6949,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:554
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 "
@@ -6681,30 +6963,31 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:566
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:567
msgid ""
-"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"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 then this flag is present unless it is "
-"explicit called to do so in an extra call. Note that this option exists "
+"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 add these flag also to the unpack and remove calls."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:574
#, fuzzy
+#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:575
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6713,35 +6996,35 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next option. "
"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally relay on dpkg for configuration (which will at the moment fail if a "
+"totally rely on dpkg for configuration (which will at the moment fail if a "
"Pre-Depends is encountered). Setting this option to another than the all "
-"value will implicit activate also the next option per default as otherwise "
+"value will implicitly 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:542
+#: apt.conf.5.xml:585
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:586
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 the previous option is not set "
"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In this sceneries "
+"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><term>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:592
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:593
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6751,12 +7034,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:555
+#: apt.conf.5.xml:598
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:599
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6768,12 +7051,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:606
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:614
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6785,7 +7068,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:607
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -6799,12 +7082,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:627
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:628
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6816,12 +7099,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:636
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:638
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6839,7 +7122,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:649
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6850,7 +7133,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:657
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6862,7 +7145,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:623
+#: apt.conf.5.xml:666
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6872,9 +7155,9 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:631
+#: apt.conf.5.xml:674
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -6883,62 +7166,59 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:684
msgid "A full list of debugging options to apt follows."
msgstr "Liste complète des options de débogage de APT :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:689
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:650
-msgid ""
-"Print information related to accessing <literal>cdrom://</literal> sources."
+#: apt.conf.5.xml:693
+msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"Affiche les informations concernant les sources de type <literal>cdrom://</"
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:700
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:661
+#: apt.conf.5.xml:704
msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Affiche les informations concernant le téléchargement de paquets par 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:668
+#: apt.conf.5.xml:711
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:672
+#: apt.conf.5.xml:715
msgid "Print information related to downloading packages using HTTP."
-msgstr ""
-"Affiche les informations concernant le téléchargement de paquets par 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:679
+#: apt.conf.5.xml:722
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:683
+#: apt.conf.5.xml:726
msgid "Print information related to downloading packages using HTTPS."
msgstr "Print information related to downloading packages using HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:733
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:694
+#: apt.conf.5.xml:737
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -6947,12 +7227,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:744
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:748
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -6961,24 +7241,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:755
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:758
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Décrit le processus de résolution des dépendances pour la construction de "
"paquets source ( « build-dependencies » ) par &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:765
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:768
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -6987,12 +7267,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:775
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:778
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 "
@@ -7003,12 +7283,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:786
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:789
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."
@@ -7018,24 +7298,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:754
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:801
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Trace les ajouts et suppressions d'éléments de la queue globale de "
"téléchargement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:808
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:768
+#: apt.conf.5.xml:811
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7045,12 +7325,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:818
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:778
+#: apt.conf.5.xml:821
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7060,12 +7340,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:829
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:790
+#: apt.conf.5.xml:833
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7075,25 +7355,24 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:840
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:801
-msgid ""
-"Log all interactions with the sub-processes that actually perform downloads."
+#: apt.conf.5.xml:844
+msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"Affiche toutes les interactions avec les processus enfants qui se chargent "
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:851
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:855
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7102,12 +7381,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:862
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:822
+#: apt.conf.5.xml:865
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7122,12 +7401,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:876
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:836
+#: apt.conf.5.xml:879
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7162,24 +7441,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:901
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:908
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:911
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7188,12 +7467,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:922
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7203,12 +7482,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:886
+#: apt.conf.5.xml:929
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:933
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7217,33 +7496,32 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:941
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
-msgid ""
-"Output status messages tracing the steps performed when invoking &dpkg;."
+#: apt.conf.5.xml:945
+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:909
+#: apt.conf.5.xml:952
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:956
msgid "Output the priority of each package list on startup."
msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:962
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:966
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7252,12 +7530,12 @@ 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:931
+#: apt.conf.5.xml:974
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:934
+#: apt.conf.5.xml:977
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 "
@@ -7268,12 +7546,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:985
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:989
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7282,7 +7560,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1012
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7291,18 +7569,19 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:975
+#: apt.conf.5.xml:1019
#, fuzzy
+#| msgid "&apt-conf;"
msgid "&file-aptconf;"
msgstr "&apt-conf;"
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1024
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
@@ -7321,6 +7600,10 @@ msgstr "Fichier de contrôle des préférences pour APT"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
#, fuzzy
+#| msgid ""
+#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
+#| "used to control which versions of packages will be selected for "
+#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -7440,8 +7723,7 @@ msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:94
-msgid ""
-"to the versions that are not installed and belong to the target release."
+msgid "to the versions that are not installed and belong to the target release."
msgstr ""
"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
"la distribution par défaut."
@@ -7926,8 +8208,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:306
msgid "Determination of Package Version and Distribution Properties"
-msgstr ""
-"Détermination de la version des paquets et des propriétés des distributions"
+msgstr "Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:308
@@ -8498,6 +8779,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:617
#, fuzzy
+#| msgid "apt_preferences"
msgid "&file-preferences;"
msgstr "apt_preferences"
@@ -8518,11 +8800,17 @@ msgstr "Liste des sources de paquets"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
+#, fuzzy
+#| msgid ""
+#| "The package resource list is used to locate archives of the package "
+#| "distribution system in use on the system. At this time, this manual page "
+#| "documents only the packaging system used by the Debian GNU/Linux system. "
+#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is located in <filename>/etc/apt/sources.list</filename>"
+"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"La liste des sources de paquets indique où trouver les archives du système "
"de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne "
@@ -8531,12 +8819,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
+#, fuzzy
+#| msgid ""
+#| "The source list is designed to support any number of active sources and a "
+#| "variety of source media. The file lists one source per line, with the "
+#| "most preferred source listed first. The format of each line is: "
+#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#| "determines the format for <literal>args</literal> <literal>uri</literal> "
+#| "is a Universal Resource Identifier (URI), which is a superset of the more "
+#| "specific and well-known Universal Resource Locator, or URL. The rest of "
+#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -8581,13 +8879,24 @@ msgstr "Les types deb et deb-src."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. Typically, "
+#| "<literal>distribution</literal> is generally one of <literal>stable</"
+#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
+#| "component is one of <literal>main</literal> <literal>contrib</literal> "
+#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
+#| "src</literal> type describes a debian distribution's source code in the "
+#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
+#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
"<literal>distribution</literal> is generally one of <literal>stable</"
"literal> <literal>unstable</literal> or <literal>testing</literal> while "
"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
+"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
"src</literal> type describes a debian distribution's source code in the same "
"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line "
"is required to fetch source indexes."
@@ -8605,9 +8914,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types are:"
+"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
"Le format d'une entrée dans <filename>sources.list</filename> utilisant les "
"types <literal>deb</literal> et <literal>deb-src</literal> est de la forme :"
@@ -8620,13 +8933,23 @@ msgstr "deb uri distribution [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (/). This is useful for when only a particular sub-"
+#| "section of the archive denoted by the URI is of interest. If "
+#| "<literal>distribution</literal> does not specify an exact path, at least "
+#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when only a particular sub-section of the "
-"archive denoted by the URI is of interest. If <literal>distribution</"
+"a slash (/). This is useful for when the case only a particular sub-section "
+"of the archive denoted by the URI is of interest. If <literal>distribution</"
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
@@ -8746,12 +9069,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "The http scheme specifies an HTTP server for the archive. If an "
+#| "environment variable <envar>http_proxy</envar> is set with the format "
+#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#| "string of the format http://user:pass@server:port/ Note that this is an "
+#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/ Note that this is an insecure method of "
+"http://user:pass@server:port/. Note that this is an insecure method of "
"authentication."
msgstr ""
"Le procédé <literal>http</literal> indique un serveur HTTP comme archive. Si "
@@ -8823,6 +9154,24 @@ msgstr ""
"l'accès aux fichiers de la machine distante et le transfert, on utilise les "
"commandes standard <command>find</command> et <command>dd</command>."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:178
+msgid "more recongnizable URI types"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:180
+msgid ""
+"APT can be extended with more methods shipped in other optional packages "
+"which should follow the nameing scheme <literal>apt-transport-"
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"also the <literal>apt-transport-https</literal> package which provides "
+"access methods for https-URIs with features similiar to the http method, but "
+"other methods for using e.g. debtorrent are also available, see "
+"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
+"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
msgid ""
@@ -8833,7 +9182,7 @@ msgstr ""
"ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:194
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8842,37 +9191,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:196
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:198
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:187
+#: sources.list.5.xml:199
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:201
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:202
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:192
+#: sources.list.5.xml:204
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8881,13 +9230,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:206
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:208
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
@@ -8896,18 +9245,24 @@ msgstr ""
"répertoire debian, et n'utiliser que la section stable/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:210
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:212
+#, fuzzy
+#| msgid ""
+#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
+#| "directory, and uses only the unstable/contrib area. If this line appears "
+#| "as well as the one in the previous example in <filename>sources.list</"
+#| "filename>. a single FTP session will be used for both resource lines."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</"
-"filename>. a single FTP session will be used for both resource lines."
+"well as the one in the previous example in <filename>sources.list</filename> "
+"a single FTP session will be used for both resource lines."
msgstr ""
"Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le "
"répertoire debian, et n'utiliser que la section unstable/contrib. Si cette "
@@ -8915,13 +9270,13 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:216
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:218
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -8930,19 +9285,19 @@ msgstr ""
"répertoire debian-non-US."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:222
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8961,10 +9316,1088 @@ msgstr ""
"\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:234
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
+#. type: <title></title>
+#: guide.sgml:4
+msgid "APT User's Guide"
+msgstr ""
+
+#. type: <author></author>
+#: guide.sgml:6 offline.sgml:6
+msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+msgstr ""
+
+#. type: <version></version>
+#: guide.sgml:7
+msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: guide.sgml:11
+msgid "This document provides an overview of how to use the the APT package manager."
+msgstr ""
+
+#. type: <copyrightsummary></copyrightsummary>
+#: guide.sgml:15
+msgid "Copyright &copy; Jason Gunthorpe, 1998."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:21 offline.sgml:22
+msgid ""
+"\"APT\" and this document are free software; you can redistribute them and/"
+"or modify them under the terms of the GNU General Public License as "
+"published by the Free Software Foundation; either version 2 of the License, "
+"or (at your option) any later version."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:24 offline.sgml:25
+msgid ""
+"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"common-licenses/GPL for the full license."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:32
+#, fuzzy
+#| msgid "generate"
+msgid "General"
+msgstr "generate"
+
+#. type: <p></p>
+#: guide.sgml:38
+msgid ""
+"The APT package currently contains two sections, the APT <prgn>dselect</"
+"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
+"provide a way to install and remove packages as well as download new "
+"packages from the Internet."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:39
+msgid "Anatomy of the Package System"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:44
+msgid ""
+"The Debian packaging system has a large amount of information associated "
+"with each package to help assure that it integrates cleanly and easily into "
+"the system. The most prominent of its features is the dependency system."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:52
+msgid ""
+"The dependency system allows individual programs to make use of shared "
+"elements in the system such as libraries. It simplifies placing infrequently "
+"used portions of a program in separate packages to reduce the number of "
+"things the average user is required to install. Also, it allows for choices "
+"in mail transport agents, X servers and so on."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:57
+msgid ""
+"The first step to understanding the dependency system is to grasp the "
+"concept of a simple dependency. The meaning of a simple dependency is that a "
+"package requires another package to be installed at the same time to work "
+"properly."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:63
+msgid ""
+"For instance, mailcrypt is an emacs extension that aids in encrypting email "
+"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"simple dependency on GPG. Also, because it is an emacs extension it has a "
+"simple dependency on emacs, without emacs it is completely useless."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:73
+msgid ""
+"The other important dependency to understand is a conflicting dependency. It "
+"means that a package, when installed with another package, will not work and "
+"may possibly be extremely harmful to the system. As an example consider a "
+"mail transport agent such as sendmail, exim or qmail. It is not possible to "
+"have two mail transport agents installed because both need to listen to the "
+"network to receive mail. Attempting to install two will seriously damage the "
+"system so all mail transport agents have a conflicting dependency with all "
+"other mail transport agents."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:83
+msgid ""
+"As an added complication there is the possibility for a package to pretend "
+"to be another package. Consider that exim and sendmail for many intents are "
+"identical, they both deliver mail and understand a common interface. Hence, "
+"the package system has a way for them to declare that they are both mail-"
+"transport-agents. So, exim and sendmail both declare that they provide a "
+"mail-transport-agent and other packages that need a mail transport agent "
+"depend on mail-transport-agent. This can add a great deal of confusion when "
+"trying to manually fix packages."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:88
+msgid ""
+"At any given time a single dependency may be met by packages that are "
+"already installed or it may not be. APT attempts to help resolve dependency "
+"issues by providing a number of automatic algorithms that help in selecting "
+"packages for installation."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:102
+msgid ""
+"<prgn>apt-get</prgn> provides a simple way to install packages from the "
+"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
+"understand .deb files, it works with the package's proper name and can only "
+"install .deb archives from a <em>Source</em>."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:109
+msgid ""
+"The first <footnote><p>If you are using an http proxy server you must set "
+"the http_proxy environment variable first, see sources.list(5)</p></"
+"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
+"fetch the package lists from the <em>Sources</em> so that it knows what "
+"packages are available. This is done with <tt>apt-get update</tt>. For "
+"instance,"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:116
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p><taglist>
+#: guide.sgml:120
+msgid "Once updated there are several commands that can be used:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:131
+msgid ""
+"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
+"install a new package or remove an existing package, nor will it ever "
+"upgrade a package that might cause some other package to break. This can be "
+"used daily to relatively safely upgrade the system. Upgrade will list all of "
+"the packages that it could not upgrade, this usually means that they depend "
+"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
+"<tt>apt-get install</tt> can be used to force these packages to install."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:140
+msgid ""
+"Install is used to install packages by name. The package is automatically "
+"fetched and installed. This can be useful if you already know the name of "
+"the package to install and do not want to go into a GUI to select it. Any "
+"number of packages may be passed to install, they will all be fetched. "
+"Install automatically attempts to resolve dependency problems with the "
+"listed packages and will print a summary and ask for confirmation if "
+"anything other than its arguments are changed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:149
+msgid ""
+"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
+"releases of Debian. It uses a sophisticated algorithm to determine the best "
+"set of packages to install, upgrade and remove to get as much of the system "
+"to the newest release. In some situations it may be desired to use dist-"
+"upgrade rather than spend the time manually resolving dependencies in "
+"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
+"prgn> can be used to install any packages that may have been left out."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:152
+msgid ""
+"It is important to closely look at what dist-upgrade is going to do, its "
+"decisions may sometimes be quite surprising."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:163
+msgid ""
+"<prgn>apt-get</prgn> has several command line options that are detailed in "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"option is <tt>-d</tt> which does not install the fetched files. If the "
+"system has to download a large number of package it would be undesired to "
+"start installing them in case something goes wrong. When <tt>-d</tt> is used "
+"the downloaded archives can be installed by simply running the command that "
+"caused them to be downloaded again without <tt>-d</tt>."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:168
+#, fuzzy
+#| msgid "APT in DSelect"
+msgid "DSelect"
+msgstr "APT et DSelect"
+
+#. type: <p></p>
+#: guide.sgml:173
+msgid ""
+"The APT <prgn>dselect</prgn> method provides the complete APT system with "
+"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
+"to select the packages to be installed or removed and APT actually installs "
+"them."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:184
+msgid ""
+"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
+"prgn> and then choose the APT method. You will be prompted for a set of "
+"<em>Sources</em> which are places to fetch archives from. These can be "
+"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"provide a fragment of the total Debian archive, APT will automatically "
+"combine them to form a complete set of packages. If you have a CDROM then it "
+"is a good idea to specify it first and then specify a mirror so that you "
+"have access to the latest bug fixes. APT will automatically use packages on "
+"your CDROM before downloading from the Internet."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:198
+#, no-wrap
+msgid ""
+" Set up a list of distribution source locations\n"
+"\t \n"
+" Please give the base URL of the debian distribution.\n"
+" The access schemes I know about are: http file\n"
+"\t \n"
+" For example:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:205
+msgid ""
+"The <em>Sources</em> setup starts by asking for the base of the Debian "
+"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
+"get."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:212
+#, no-wrap
+msgid ""
+" Please give the distribution tag to get or a path to the\n"
+" package file ending in a /. The distribution\n"
+" tags are typically something like: stable unstable testing non-US\n"
+" \n"
+" Distribution [stable]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:222
+msgid ""
+"The distribution refers to the Debian version in the archive, <em>stable</"
+"em> refers to the latest released version and <em>unstable</em> refers to "
+"the developmental version. <em>non-US</em> is only available on some mirrors "
+"and refers to packages that contain encryption technology or other things "
+"that cannot be exported from the United States. Importing these packages "
+"into the US is legal however."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:228
+#, no-wrap
+msgid ""
+" Please give the components to get\n"
+" The components are typically something like: main contrib non-free\n"
+" \n"
+" Components [main contrib non-free]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:236
+msgid ""
+"The components list refers to the list of sub distributions to fetch. The "
+"distribution is split up based on software licenses, main being DFSG free "
+"packages while contrib and non-free contain things that have various "
+"restrictions placed on their use and distribution."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:240
+msgid ""
+"Any number of sources can be added, the setup script will continue to prompt "
+"until you have specified all that you want."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:247
+msgid ""
+"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+"available list by selecting [U]pdate from the menu. This is a super-set of "
+"<tt>apt-get update</tt> that makes the fetched information available to "
+"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
+"tt> has been run before."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:253
+msgid ""
+"You can then go on and make your selections using [S]elect and then perform "
+"the installation using [I]nstall. When using the APT method the [C]onfig and "
+"[R]emove commands have no meaning, the [I]nstall command performs both of "
+"them together."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:258
+msgid ""
+"By default APT will automatically remove the package (.deb) files once they "
+"have been successfully installed. To change this behavior place <tt>Dselect::"
+"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:264
+msgid "The Interface"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:278
+msgid ""
+"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
+"same interface. It is a simple system that generally tells you what it will "
+"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
+"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
+"actually provides more functionality than is present in <prgn>apt-get</prgn> "
+"alone.</p></footnote> After printing out a summary of what will happen APT "
+"then will print out some informative status messages so that you can "
+"estimate how far along it is and how much is left to do."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:280
+msgid "Startup"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:284
+msgid ""
+"Before all operations except update, APT performs a number of actions to "
+"prepare its internal state. It also does some checks of the system's state. "
+"At any time these operations can be performed by running <tt>apt-get check</"
+"tt>."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:289
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:297
+msgid ""
+"The first thing it does is read all the package files into memory. APT uses "
+"a caching scheme so this operation will be faster the second time it is run. "
+"If some of the package files are not found then they will be ignored and a "
+"warning will be printed when apt-get exits."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:303
+msgid ""
+"The final operation performs a detailed analysis of the system's "
+"dependencies. It checks every dependency of every installed or unpacked "
+"package and considers if it is OK. Should this find a problem then a report "
+"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:320
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done\n"
+"You might want to run apt-get -f install' to correct these.\n"
+"Sorry, but the following packages have unmet dependencies:\n"
+" 9fonts: Depends: xlib6g but it is not installed\n"
+" uucp: Depends: mailx but it is not installed\n"
+" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" adduser: Depends: perl-base but it is not installed\n"
+" aumix: Depends: libgpmg1 but it is not installed\n"
+" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 but it is not installed\n"
+" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:329
+msgid ""
+"In this example the system has many problems, including a serious problem "
+"with libreadlineg2. For each package that has unmet dependencies a line is "
+"printed out indicating the package with the problem and the dependencies "
+"that are unmet. A short explanation of why the package has a dependency "
+"problem is also included."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:337
+msgid ""
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
+"packages when performing upgrades. <footnote><p>APT however considers all "
+"known dependencies and attempts to prevent broken packages</p></footnote>. "
+"The second is if a package installation fails during an operation. In this "
+"situation a package may have been unpacked without its dependents being "
+"installed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:345
+msgid ""
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
+"deduce a possible solution to the problem and then continue on. The APT "
+"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
+"for easy continuation of failed maintainer scripts."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:351
+msgid ""
+"However, if the <tt>-f</tt> option is used to correct a seriously broken "
+"system caused by the first case then it is possible that it will either fail "
+"immediately or the installation sequence will fail. In either case it is "
+"necessary to manually use dpkg (possibly with forcing options) to correct "
+"the situation enough to allow APT to proceed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:356
+msgid "The Status Report"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:363
+msgid ""
+"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
+"happen. Generally the report reflects the type of operation being performed "
+"but there are several common elements. In all cases the lists reflect the "
+"final state of things, taking into account the <tt>-f</tt> option and any "
+"other relevant activities to the command being executed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:364
+msgid "The Extra Package list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:372
+#, no-wrap
+msgid ""
+"The following extra packages will be installed:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:379
+msgid ""
+"The Extra Package list shows all of the packages that will be installed or "
+"upgraded in excess of the ones mentioned on the command line. It is only "
+"generated for an <tt>install</tt> command. The listed packages are often the "
+"result of an Auto Install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:382
+msgid "The Packages to Remove"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:389
+#, no-wrap
+msgid ""
+"The following packages will be REMOVED:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:399
+msgid ""
+"The Packages to Remove list shows all of the packages that will be removed "
+"from the system. It can be shown for any of the operations and should be "
+"given a careful inspection to ensure nothing important is to be taken off. "
+"The <tt>-f</tt> option is especially good at generating packages to remove "
+"so extreme care should be used in that case. The list may contain packages "
+"that are going to be removed because they are only partially installed, "
+"possibly due to an aborted installation."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:402
+msgid "The New Packages list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:406
+#, no-wrap
+msgid ""
+"The following NEW packages will installed:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:411
+msgid ""
+"The New Packages list is simply a reminder of what will happen. The packages "
+"listed are not presently installed in the system but will be when APT is "
+"done."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:414
+msgid "The Kept Back list"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:419
+#, no-wrap
+msgid ""
+"The following packages have been kept back\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:428
+msgid ""
+"Whenever the whole system is being upgraded there is the possibility that "
+"new versions of packages cannot be installed because they require new things "
+"or conflict with already installed things. In this case the package will "
+"appear in the Kept Back list. The best way to convince packages listed there "
+"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
+"to resolve their problems."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:431
+msgid "Held Packages warning"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:435
+#, no-wrap
+msgid ""
+"The following held packages will be changed:\n"
+" cvs"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:441
+msgid ""
+"Sometimes you can ask APT to install a package that is on hold, in such a "
+"case it prints out a warning that the held package is going to be changed. "
+"This should only happen during dist-upgrade or install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:444
+msgid "Final summary"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:447
+msgid "Finally, APT will print out a summary of all the changes that will occur."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:452
+#, no-wrap
+msgid ""
+"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
+"12 packages not fully installed or removed.\n"
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:470
+msgid ""
+"The first line of the summary simply is a reduced version of all of the "
+"lists and includes the number of upgrades - that is packages already "
+"installed that have new versions available. The second line indicates the "
+"number of poorly configured packages, possibly the result of an aborted "
+"installation. The final line shows the space requirements that the "
+"installation needs. The first pair of numbers refer to the size of the "
+"archive files. The first number indicates the number of bytes that must be "
+"fetched from remote locations and the second indicates the total size of all "
+"the archives required. The next number indicates the size difference between "
+"the presently installed packages and the newly installed packages. It is "
+"roughly equivalent to the space required in /usr after everything is done. "
+"If a large number of packages are being removed then the value may indicate "
+"the amount of space that will be freed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:473
+msgid ""
+"Some other reports can be generated by using the -u option to show packages "
+"to upgrade, they are similar to the previous examples."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:477
+msgid "The Status Display"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:481
+msgid ""
+"During the download of archives and package files APT prints out a series of "
+"status messages."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:490
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:500
+msgid ""
+"The lines starting with <em>Get</em> are printed out when APT begins to "
+"fetch a file while the last line indicates the progress of the download. The "
+"first percent value on the progress line indicates the total percent done of "
+"all files. Unfortunately since the size of the Package files is unknown "
+"<tt>apt-get update</tt> estimates the percent done which causes some "
+"inaccuracies."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:509
+msgid ""
+"The next section of the status line is repeated once for each download "
+"thread and indicates the operation being performed and some useful "
+"information about what is happening. Sometimes this section will simply read "
+"<em>Forking</em> which means the OS is loading the download module. The "
+"first word after the [ is the fetch number as shown on the history lines. "
+"The next word is the short form name of the object being downloaded. For "
+"archives it will contain the name of the package that is being fetched."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:524
+msgid ""
+"Inside of the single quote is an informative string indicating the progress "
+"of the negotiation phase of the download. Typically it progresses from "
+"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
+"<em>Resuming</em>. The final value is the number of bytes downloaded from "
+"the remote site. Once the download begins this is represented as "
+"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
+"kilobytes is expected. The total size is always shown in 4 figure notation "
+"to preserve space. After the size display is a percent meter for the file "
+"itself. The second last element is the instantaneous average speed. This "
+"values is updated every 5 seconds and reflects the rate of data transfer for "
+"that period. Finally is shown the estimated transfer time. This is updated "
+"regularly and reflects the time to complete everything at the shown transfer "
+"rate."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:530
+msgid ""
+"The status display updates every half second to provide a constant feedback "
+"on the download progress while the Get lines scroll back whenever a new file "
+"is started. Since the status display is constantly updated it is unsuitable "
+"for logging to a file, use the <tt>-q</tt> option to remove the status "
+"display."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:535
+msgid "Dpkg"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:542
+msgid ""
+"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
+"to the <prgn>dpkg</prgn> interface once downloading is completed. "
+"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
+"packages and the packages themselves may also ask several questions. Before "
+"each question there is usually a description of what it is asking and the "
+"questions are too varied to discuss completely here."
+msgstr ""
+
+#. type: <title></title>
+#: offline.sgml:4
+msgid "Using APT Offline"
+msgstr ""
+
+#. type: <version></version>
+#: offline.sgml:7
+msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: offline.sgml:12
+msgid ""
+"This document describes how to use APT in a non-networked environment, "
+"specifically a 'sneaker-net' approach for performing upgrades."
+msgstr ""
+
+#. type: <copyrightsummary></copyrightsummary>
+#: offline.sgml:16
+msgid "Copyright &copy; Jason Gunthorpe, 1999."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:32
+msgid "Introduction"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#, fuzzy
+#| msgid "OverrideDir"
+msgid "Overview"
+msgstr "OverrideDir"
+
+#. type: <p></p>
+#: offline.sgml:40
+msgid ""
+"Normally APT requires direct access to a Debian archive, either from a local "
+"media or through a network. Another common complaint is that a Debian "
+"machine is on a slow link, such as a modem and another machine has a very "
+"fast connection but they are physically distant."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:51
+msgid ""
+"The solution to this is to use large removable media such as a Zip disc or a "
+"SuperDisk disc. These discs are not large enough to store the entire Debian "
+"archive but can easily fit a subset large enough for most users. The idea is "
+"to use APT to generate a list of packages that are required and then fetch "
+"them onto the disc using another machine with good connectivity. It is even "
+"possible to use another Debian machine with APT or to use a completely "
+"different OS and a download tool like wget. Let <em>remote host</em> mean "
+"the machine downloading the packages, and <em>target host</em> the one with "
+"bad or no connection."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:57
+msgid ""
+"This is achieved by creatively manipulating the APT configuration file. The "
+"essential premis to tell APT to look on a disc for it's archive files. Note "
+"that the disc should be formated with a filesystem that can handle long file "
+"names such as ext2, fat32 or vfat."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:63
+msgid "Using APT on both machines"
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:71
+msgid ""
+"APT being available on both machines gives the simplest configuration. The "
+"basic idea is to place a copy of the status file on the disc and use the "
+"remote machine to fetch the latest package files and decide which packages "
+"to download. The disk directory structure should look like:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:80
+#, no-wrap
+msgid ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:88
+#, fuzzy
+#| msgid "User configuration"
+msgid "The configuration file"
+msgstr "Configuration utilisateur"
+
+#. type: <p></p>
+#: offline.sgml:96
+msgid ""
+"The configuration file should tell APT to store its files on the disc and to "
+"use the configuration files on the disc as well. The sources.list should "
+"contain the proper sites that you wish to use from the remote machine, and "
+"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
+"<em>target host</em>. Please note, if you are using a local archive you must "
+"use copy URIs, the syntax is identical to file URIs."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:100
+msgid ""
+"<em>apt.conf</em> must contain the necessary information to make APT use the "
+"disc:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:124
+#, no-wrap
+msgid ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it tells\n"
+" the remote APT what architecture the target machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:129
+msgid ""
+"More details can be seen by examining the apt.conf man page and the sample "
+"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:136
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy <em>/"
+"var/lib/dpkg/status</em> to it. You will also need to create the directories "
+"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
+"em> Then take the disc to the remote machine and configure the sources.list. "
+"On the remote machine execute the following:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:142
+#, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT fetches the package files ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT fetches all the packages needed to upgrade the target machine ]"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:149
+msgid ""
+"The dist-upgrade command can be replaced with any-other standard APT "
+"commands, particularly dselect-upgrade. You can even use an APT front end "
+"such as <em>dselect</em> However this presents a problem in communicating "
+"your selections back to the local computer."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:153
+msgid ""
+"Now the disc contains all of the index files and archives needed to upgrade "
+"the target machine. Take the disc back and run:"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:159
+#, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT generates a local copy of the cache files ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Or any other APT command ]"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:165
+msgid ""
+"It is necessary for proper function to re-specify the status file to be the "
+"local one. This is very important!"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:172
+msgid ""
+"If you are using dselect you can do the very risky operation of copying disc/"
+"status to /var/lib/dpkg/status so that any selections you made on the remote "
+"machine are updated. I highly recommend that people only make selections on "
+"the local machine - but this may not always be possible. DO NOT copy the "
+"status file if dpkg or APT have been run in the mean time!!"
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:178
+msgid "Using APT and wget"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:185
+msgid ""
+"<em>wget</em> is a popular and portable download tool that can run on nearly "
+"any machine. Unlike the method above this requires that the Debian machine "
+"already has a list of available packages."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:190
+msgid ""
+"The basic idea is to create a disc that has only the archive files "
+"downloaded from the remote site. This is done by using the --print-uris "
+"option to apt-get and then preparing a wget script to actually fetch the "
+"packages."
+msgstr ""
+
+#. type: <heading></heading>
+#: offline.sgml:196
+#, fuzzy
+#| msgid "Options"
+msgid "Operation"
+msgstr "Options"
+
+#. type: <p><example>
+#: offline.sgml:200
+msgid ""
+"Unlike the previous technique no special configuration files are required. "
+"We merely use the standard APT commands to generate the file list."
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:205
+#, no-wrap
+msgid ""
+" # apt-get dist-upgrade \n"
+" [ Press no when prompted, make sure you are happy with the actions ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:210
+msgid ""
+"Any command other than dist-upgrade could be used here, including dselect-"
+"upgrade."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:216
+msgid ""
+"The /disc/wget-script file will now contain a list of wget commands to "
+"execute in order to fetch the necessary archives. This script should be run "
+"with the current directory as the disc's mount point so as to save the "
+"output on the disc."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:219
+msgid "The remote machine would do something like"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:223
+#, no-wrap
+msgid ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ wait.. ]"
+msgstr ""
+
+#. type: </example><example>
+#: offline.sgml:228
+msgid ""
+"Once the archives are downloaded and the disc returned to the Debian machine "
+"installation can proceed using,"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:230
+#, no-wrap
+msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:234
+msgid "Which will use the already fetched archives on the disc."
+msgstr ""
+
+#~ msgid ""
+#~ "Disable Immediate Configuration; This dangerous option disables some of "
+#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+#~ "necessary on some extremely slow single user systems but is very "
+#~ "dangerous and may cause package install scripts to fail or worse. Use at "
+#~ "your own risk."
+#~ msgstr ""
+#~ "Désactive la configuration immédiate ; cette dangereuse option désactive "
+#~ "une partie du code de mise en ordre de APT pour que ce dernier effectue "
+#~ "le moins d'appels possible à &dpkg;. Ça peut être nécessaire sur des "
+#~ "systèmes à un seul utilisateur extrêmement lents, mais cette option est "
+#~ "très dangereuse et peut faire échouer les scripts d'installation, voire "
+#~ "pire. Utilisez-la à vos risques et périls."
+
#~ msgid "<filename>/etc/apt/sources.list</filename>"
#~ msgstr "<filename>/etc/apt/sources.list</filename>"
diff --git a/doc/po/it.po b/doc/po/it.po
index 37cf5d078..e4dd528a5 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-11-27 00:18+0100\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 53684a0cd..ba04b200f 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-12-01 19:13+0100\n"
+"POT-Creation-Date: 2009-11-27 00:05+0100\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"
@@ -371,11 +371,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -419,11 +425,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -435,11 +447,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:108
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
+#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -451,11 +469,17 @@ msgstr ""
#. type: Plain text
#: apt.ent:114
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY dselect \"<citerefentry>\n"
+#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
+#| " <manvolnum>8</manvolnum>\n"
+#| " </citerefentry>\"\n"
+#| ">\n"
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -580,6 +604,15 @@ msgstr ""
#. type: Plain text
#: apt.ent:168
#, fuzzy, no-wrap
+#| msgid ""
+#| "<!-- Boiler plate docinfo section -->\n"
+#| "<!ENTITY apt-docinfo \"\n"
+#| " <refentryinfo>\n"
+#| " <address><email>apt@packages.debian.org</email></address>\n"
+#| " <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
+#| " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
+#| " <date>28 October 2008</date>\n"
+#| " <productname>Linux</productname>\n"
msgid ""
"<!-- Boiler plate docinfo section -->\n"
"<!ENTITY apt-docinfo \"\n"
@@ -631,6 +664,13 @@ msgstr ""
#. type: Plain text
#: apt.ent:185
#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY apt-author.jgunthorpe \"\n"
+#| " <author>\n"
+#| " <firstname>Jason</firstname>\n"
+#| " <surname>Gunthorpe</surname>\n"
+#| " </author>\n"
+#| "\">\n"
msgid ""
"<!ENTITY apt-author.jgunthorpe \"\n"
" <author>\n"
@@ -650,6 +690,13 @@ msgstr ""
#. type: Plain text
#: apt.ent:193
#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY apt-author.moconnor \"\n"
+#| " <author>\n"
+#| " <firstname>Mike</firstname>\n"
+#| " <surname>O'Connor</surname>\n"
+#| " </author>\n"
+#| "\">\n"
msgid ""
"<!ENTITY apt-author.moconnor \"\n"
" <author>\n"
@@ -669,6 +716,12 @@ msgstr ""
#. type: Plain text
#: apt.ent:200
#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY apt-author.team \"\n"
+#| " <author>\n"
+#| " <othername>APT team</othername>\n"
+#| " </author>\n"
+#| "\">\n"
msgid ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
@@ -933,6 +986,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:315
#, fuzzy, no-wrap
+#| msgid "Storage area for package files in transit. Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
@@ -945,6 +999,7 @@ msgstr "取得中パッケージファイル格納エリア。設定項目 - <li
#. type: Plain text
#: apt.ent:325
#, fuzzy, no-wrap
+#| msgid "Version preferences file. This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: <literal>Dir::Etc::Preferences</literal>."
msgid ""
"<!ENTITY file-preferences \"\n"
" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
@@ -994,6 +1049,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:350
#, fuzzy, no-wrap
+#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
msgid ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
@@ -1007,6 +1063,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
#. type: Plain text
#: apt.ent:355
#, fuzzy, no-wrap
+#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
@@ -1018,7 +1075,7 @@ msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::Stat
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
-#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
"February 2004</date>"
@@ -1329,10 +1386,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
+#, fuzzy
+#| msgid ""
+#| "<literal>Missing</literal> is the number of package names that were "
+#| "referenced in a dependency but were not provided by any package. Missing "
+#| "packages may be in evidence if a full distribution is not accessed, or if "
+#| "a package (real or virtual) has been dropped from the distribution. "
+#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be in evidence if a full distribution is not accessed, or if a "
+"packages may be an evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1525,6 +1589,12 @@ msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:229
#, fuzzy
+#| msgid ""
+#| "This command prints the name of each package in the system. The optional "
+#| "argument is a prefix match to filter the name list. The output is "
+#| "suitable for use in a shell tab complete function and the output is "
+#| "generated extremely quickly. This command is best used with the <option>--"
+#| "generate</option> option."
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -1654,7 +1724,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
msgid "options"
msgstr "オプション"
@@ -1896,7 +1966,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
@@ -1904,7 +1974,7 @@ msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:973 apt_preferences.5.xml:615
+#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
msgid "Files"
msgstr "ファイル"
@@ -1916,10 +1986,10 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 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:979 apt_preferences.5.xml:622
-#: sources.list.5.xml:221
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -1932,7 +2002,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2333,7 +2403,7 @@ msgstr "設定箇所の内容を表示するだけです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2429,10 +2499,15 @@ msgstr "<option>--tempdir</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
+#, fuzzy
+#| msgid ""
+#| "Temporary directory in which to write extracted debconf template files "
+#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
+#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
-"literal>"
+"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
+"TempDir</literal>"
msgstr ""
"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト"
"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>"
@@ -2447,6 +2522,20 @@ msgstr ""
"<command>apt-extracttemplates</command> は正常終了時に 0 を返します。エラー時"
"には十進の 100 を返します。"
+#. The last update date
+#. type: Content of: <refentry><refentryinfo>
+#: apt-ftparchive.1.xml:13
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
+#| "November 2007</date>"
+msgid ""
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"August 2009</date>"
+msgstr ""
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
+"November 2007</date>"
+
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
@@ -2463,6 +2552,25 @@ msgstr "インデックスファイル生成ユーティリティ"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
#, fuzzy
+#| msgid ""
+#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#| "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#| "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#| "<group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#| "replaceable></arg><arg><replaceable>override</"
+#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -2743,11 +2851,17 @@ msgstr "Dir セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
+#, fuzzy
+#| msgid ""
+#| "The <literal>Dir</literal> section defines the standard directories "
+#| "needed to locate the files required during the generation process. These "
+#| "directories are prepended to certain relative paths defined in later "
+#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended to certain relative paths defined in later "
-"sections to produce a complete an absolute path."
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
msgstr ""
"<literal>Dir</literal> セクションは、生成プロセスで必要なファイルを配置するた"
"めの、標準ディレクトリを定義します。このディレクトリは、完全な絶対パスを生成"
@@ -3605,23 +3719,40 @@ msgstr ""
"キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:547
+#, fuzzy
+#| msgid "<option>--version</option>"
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:549
+msgid ""
+"This configuration option defaults to \"<literal>true</literal>\" and should "
+"only be set to <literal>\"false\"</literal> if the Archive generated with "
+"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
+"that it is currently not possible to create these files with <command>apt-"
+"ftparchive</command>."
+msgstr ""
+
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462
-#: sources.list.5.xml:181
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:567
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:563
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3631,7 +3762,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:577
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3650,8 +3781,8 @@ msgstr ""
"November 2008</date>"
# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:29
+#. type: <heading></heading>
+#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
msgid "apt-get"
msgstr "apt-get"
@@ -3664,6 +3795,37 @@ msgstr "APT パッケージ操作ユーティリティ -- コマンドライン
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
+#| "<replaceable>target_release_name</replaceable> </arg> <arg "
+#| "choice='plain'> <replaceable>target_release_number_expression</"
+#| "replaceable> </arg> <arg choice='plain'> "
+#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
+#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
+#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
+#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
+#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "<group choice='req'> <arg choice='plain'> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
+#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
+#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
+#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> </arg> </arg> <arg "
+#| "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>check</"
+#| "arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
+#| "<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
+#| "choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
+#| "arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
+#| "choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> "
+#| "</group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@ -3769,8 +3931,8 @@ msgstr ""
"のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:147
+#. type: <tag></tag>
+#: apt-get.8.xml:147 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
@@ -3823,8 +3985,8 @@ msgstr ""
"ど)"
# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:170
+#. type: <tag></tag>
+#: apt-get.8.xml:170 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
@@ -3853,8 +4015,8 @@ msgstr ""
"さい。"
# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:183
+#. type: <tag></tag>
+#: apt-get.8.xml:183 guide.sgml:131
msgid "install"
msgstr "install"
@@ -4000,6 +4162,18 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
#, fuzzy
+#| msgid ""
+#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
+#| "source packages. APT will examine the available packages to decide which "
+#| "source package to fetch. It will then find and download into the current "
+#| "directory the newest available version of that source package. Source "
+#| "packages are tracked separately from binary packages via <literal>deb-"
+#| "src</literal> type lines in the &sources-list; file. This probably will "
+#| "mean that you will not get the same source as the package you have "
+#| "installed or as you could install. If the --compile options is specified "
+#| "then the package will be compiled to a binary .deb using dpkg-"
+#| "buildpackage, if --download-only is specified then the source package "
+#| "will not be unpacked."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4032,7 +4206,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
msgid ""
-"If the <option>--compile</option> options is specified then the package will "
+"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -4318,11 +4492,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages with and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages with and empty set of square brackets meaning "
-"breaks that are of no consequence (rare)."
+"indicate broken packages and empty set of square brackets meaning breaks "
+"that are of no consequence (rare)."
msgstr ""
"シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、設定 (Conf)、削除 "
"(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
@@ -4997,6 +5177,9 @@ msgstr "&apt-get;, &apt-secure;"
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
+#| "November 2007</date>"
msgid ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
@@ -5020,6 +5203,11 @@ msgstr "パッケージが自動的にインストールされたかどうかの
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
#, fuzzy
+#| msgid ""
+#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
+#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
+#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
+#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5047,6 +5235,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed. Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5102,9 +5296,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
-"<literal>showauto</literal> is used to print a list of manually installed "
-"packages with each package on a new line."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
"<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
"され、もう必要なくなったパッケージを削除するのに使用します。"
@@ -5112,6 +5310,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
#, fuzzy
+#| msgid "<option>-f=<filename>FILENAME</filename></option>"
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr "<option>-f=<filename>FILENAME</filename></option>"
@@ -5119,6 +5318,7 @@ msgstr "<option>-f=<filename>FILENAME</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
#, fuzzy
+#| msgid "<option>--file=<filename>FILENAME</filename></option>"
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5128,6 +5328,11 @@ msgstr "<option>--file=<filename>FILENAME</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
+#| "the default location, which is <filename>extended_status</filename> in "
+#| "the directory defined by the Configuration Item: <literal>Dir::State</"
+#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5174,6 +5379,7 @@ msgstr "プログラムのバージョン情報を表示します"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:124
#, fuzzy
+#| msgid "<filename>/etc/apt/preferences</filename>"
msgid "<filename>/var/lib/apt/extended_states</filename>"
msgstr "<filename>/etc/apt/preferences</filename>"
@@ -5189,6 +5395,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:134
#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -5262,12 +5469,20 @@ msgstr "信頼済アーカイブ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "different steps. <command>apt-secure</command> is the last step in this "
+#| "chain, trusting an archive does not mean that the packages that you trust "
+#| "it do not contain malicious code but means that you trust the archive "
+#| "maintainer. Its the archive maintainer responsibility to ensure that the "
+#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. Its the archive maintainer responsibility to ensure that the "
+"maintainer. It's the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
"apt アーカイブからエンドユーザまでの信頼の輪は、いくつかのステップで構成され"
@@ -5311,13 +5526,22 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sum of all of the packages "
+#| "files are then computed and put into the Release file. The Release file "
+#| "is then signed by the archive key (which is created once a year and "
+#| "distributed through the FTP server. This key is also on the Debian "
+#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year and distributed through the "
-"FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year) and distributed through "
+"the FTP server. This key is also on the Debian keyring."
msgstr ""
"アップロードされたパッケージごとに、検証してアーカイブに格納します。パッケー"
"ジは、メンテナの署名をはがされ、MD5 sum を計算されて、Packages ファイルに格納"
@@ -5450,8 +5674,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
+#, fuzzy
+#| msgid ""
+#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
+#| "already. You can do this by running <command>apt-ftparchive release</"
+#| "command> (provided in apt-utils)."
msgid ""
-"<literal>Create a toplevel Release file</literal>. if it does not exist "
+"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
@@ -5462,9 +5691,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
+#, fuzzy
+#| msgid ""
+#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
+#| "o Release.gpg Release</command>."
msgid ""
-"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
+"o Release.gpg Release</command>."
msgstr ""
"<literal>署名</literal>します。<command>gpg -abs -o Release.gpg Release</"
"command> を実行して、署名してください。"
@@ -5472,8 +5705,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>Publish the key fingerprint</literal>, that way your users will "
+#| "know what key they need to import in order to authenticate the files in "
+#| "the archive."
msgid ""
-"<literal>Publish the key fingerprint</literal>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -5609,6 +5847,11 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
#, fuzzy
+#| msgid ""
+#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+#| "email; &apt-product; <date>10 December 2008</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5662,11 +5905,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:50
+#, fuzzy
+#| msgid ""
+#| "The configuration file is organized in a tree with options organized into "
+#| "functional groups. option specification is given with a double colon "
+#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
+#| "option within the APT tool group, for the Get tool. options do not "
+#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. option specification is given with a double colon "
+"functional groups. Option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. options do not inherit from "
+"within the APT tool group, for the Get tool. Options do not inherit from "
"their parent groups."
msgstr ""
"設定ファイルは、機能グループごとに系統立てられたオプションを木構造で表しま"
@@ -5678,12 +5928,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:56
#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal> The trailing semicolon is required and the quotes are "
+#| "optional. A new scope can be opened with curly braces, like:"
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
"treated as comments (ignored), as well as all text between <literal>/*</"
"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing "
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
"semicolon and the quotes are required. The value must be on one line, and "
"there is no kind of string concatenation. It must not include inside "
"quotes. The behavior of the backslash \"\\\" and escaped characters inside "
@@ -5770,6 +6028,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:98
#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> and "
+#| "<literal>#clear</literal> <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included. <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendents are "
+#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5799,6 +6064,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:111
#, fuzzy
+#| msgid ""
+#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "configuration directive to be specified on the command line. The syntax "
+#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+#| "instance) followed by an equals sign then the new value of the option. "
+#| "Lists can be appended too by adding a trailing :: to the list name."
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -5924,30 +6195,47 @@ msgstr ""
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Disable Immediate Configuration; This dangerous option disables some of "
-"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-"necessary on some extremely slow single user systems but is very dangerous "
-"and may cause package install scripts to fail or worse. Use at your own "
-"risk."
+"Defaults to on which will cause APT to install essential and important "
+"packages as fast as possible in the install/upgrade operation. This is done "
+"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
+"does treat an important package in the same way as an extra package: Between "
+"the unpacking of the important package A and his configuration can then be "
+"many other unpack or configuration calls, e.g. for package B which has no "
+"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
+"script of package B generates an error) which results in a system state in "
+"which package A is unpacked but unconfigured - each package depending on A "
+"is now no longer guaranteed to work as their dependency on A is not longer "
+"satisfied. The immediate configuration marker is also applied to all "
+"dependencies which can generate a problem if the dependencies e.g. form a "
+"circle as a dependency with the immediate flag is comparable with a Pre-"
+"Dependency. So in theory it is possible that APT encounters a situation in "
+"which it is unable to perform immediate configuration, error out and refers "
+"to this option so the user can deactivate the immediate configuration "
+"temporary to be able to perform an install/upgrade again. Note the use of "
+"the word \"theory\" here as this problem was only encountered by now in real "
+"world a few times in non-stable distribution versions and caused by wrong "
+"dependencies of the package in question or by a system in an already broken "
+"state, so you should not blindly disable this option as the mentioned "
+"scenario above is not the only problem immediate configuration can help to "
+"prevent in the first place. Before a big operation like <literal>dist-"
+"upgrade</literal> is run with this option disabled it should be tried to "
+"explicitly <literal>install</literal> the package APT is unable to configure "
+"immediately, but please make sure to report your problem also to your "
+"distribution and to the APT team with the buglink below so they can work on "
+"improving or correcting the upgrade process."
msgstr ""
-"即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg の呼"
-"び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシステム"
-"では必要かもしれませんが、非常に危険で、パッケージのインストールスクリプトが"
-"失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任で使用して"
-"ください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:181
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:182
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5965,13 +6253,13 @@ msgstr ""
"不可欠パッケージで動作します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:190
msgid "Cache-Limit"
msgstr "Cache-Limit"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:191
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -5980,24 +6268,24 @@ msgstr ""
"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:195
msgid "Build-Essential"
msgstr "Build-Essential"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:196
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築依存関係で不可欠なパッケージを定義します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:199
msgid "Get"
msgstr "Get"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:200
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6006,13 +6294,13 @@ msgstr ""
"&apt-get; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:189
+#: apt.conf.5.xml:204
msgid "Cache"
msgstr "Cache"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:205
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6021,13 +6309,13 @@ msgstr ""
"は &apt-cache; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:194
+#: apt.conf.5.xml:209
msgid "CDROM"
msgstr "CDROM"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:210
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6037,17 +6325,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:216
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:221
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:222
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6057,13 +6345,13 @@ msgstr ""
"ルトでは True です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:227
msgid "Queue-Mode"
msgstr "Queue-Mode"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:213
+#: apt.conf.5.xml:228
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6078,13 +6366,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:235
msgid "Retries"
msgstr "Retries"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:236
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6093,13 +6381,13 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:225
+#: apt.conf.5.xml:240
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:226
+#: apt.conf.5.xml:241
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6110,14 +6398,21 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:230 sources.list.5.xml:139
+#: apt.conf.5.xml:245 sources.list.5.xml:139
msgid "http"
msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:246
#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
+#| "environment variable will override all settings."
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6135,7 +6430,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:239
+#: apt.conf.5.xml:254
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6160,7 +6455,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:249 apt.conf.5.xml:306
+#: apt.conf.5.xml:264 apt.conf.5.xml:328
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6172,10 +6467,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:252
+#: apt.conf.5.xml:267
+#, fuzzy
+#| msgid ""
+#| "One setting is provided to control the pipeline depth in cases where the "
+#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+#| "5 indicating how many outstanding requests APT should send. A value of "
+#| "zero MUST be specified if the remote host does not properly linger on TCP "
+#| "connections - otherwise data corruption will occur. Hosts which require "
+#| "this are in violation of RFC 2068."
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -6191,7 +6495,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:275
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6200,17 +6504,32 @@ msgid ""
"multiple servers at the same time.)"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:266
+#: apt.conf.5.xml:286
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-msgid ""
-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
+#: apt.conf.5.xml:287
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control and proxy options are the same as for "
+#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
+#| "is not supported yet."
+msgid ""
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
"HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ"
@@ -6218,7 +6537,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:271
+#: apt.conf.5.xml:293
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6240,14 +6559,26 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:150
+#: apt.conf.5.xml:311 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:290
+#: apt.conf.5.xml:312
#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
+#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
+#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6277,7 +6608,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:309
+#: apt.conf.5.xml:331
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6293,7 +6624,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:338
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6307,7 +6638,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:321
+#: apt.conf.5.xml:343
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6324,19 +6655,20 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:328 sources.list.5.xml:132
+#: apt.conf.5.xml:350 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:356
#, fuzzy, no-wrap
+#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:329
+#: apt.conf.5.xml:351
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6357,13 +6689,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:361
msgid "gpgv"
msgstr "gpgv"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340
+#: apt.conf.5.xml:362
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6374,18 +6706,18 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:367
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:373
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:368
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6397,19 +6729,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:381
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:374
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6426,13 +6758,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:385
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:383
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6447,7 +6779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:390
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6456,9 +6788,56 @@ msgid ""
"prefer uncompressed files to support the usage of local mirrors."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:396
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:397
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the Description-"
+"Translations. APT will try to display the first available Description for "
+"the Language which is listed at first. Languages can be defined with their "
+"short or long Languagecodes. Note that not all archives provide "
+"<filename>Translation</filename> files for every Language - especially the "
+"long Languagecodes are rare, so please inform you which ones are available "
+"before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:413
+#, no-wrap
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+msgid ""
+"The default list includes \"environment\" and \"en\". "
+"\"<literal>environment</literal>\" has a special meaning here: It will be "
+"replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used. To "
+"force apt to use no Translation file use the setting <literal>Acquire::"
+"Languages=none</literal>. \"<literal>none</literal>\" is another special "
+"meaning code which will stop the search for a fitting <filename>Translation</"
+"filename> file. This can be used by the system administrator to let APT "
+"know that it should download also this files without actually use them if "
+"not the environment specifies this languages. So the following example "
+"configuration will result in the order \"en, de\" in an english and in \"de, "
+"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
+"if APT is not used in a french localization, in such an environment the "
+"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
+"\"/>"
+msgstr ""
+
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:217
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6469,13 +6848,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:420
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:422
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6495,7 +6874,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:429
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6517,7 +6896,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:438
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6532,7 +6911,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:444
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6544,8 +6923,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:448
#, fuzzy
+#| msgid ""
+#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
+#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
+#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
+#| "location of the respective programs."
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6562,7 +6948,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:456
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6583,13 +6969,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:469
msgid "APT in DSelect"
msgstr "DSelect での APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:471
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6599,13 +6985,13 @@ msgstr ""
"設定項目で、デフォルトの動作を制御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:475
msgid "Clean"
msgstr "Clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:476
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6622,7 +7008,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:485
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6632,13 +7018,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:489
msgid "Updateoptions"
msgstr "Updateoptions"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:490
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6647,13 +7033,13 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:451
+#: apt.conf.5.xml:494
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:495
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6663,13 +7049,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:501
msgid "How APT calls dpkg"
msgstr "APT が dpkg を呼ぶ方法"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:502
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6679,7 +7065,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:507
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6689,18 +7075,18 @@ msgstr ""
"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:512
msgid "Post-Invoke"
msgstr "Post-Invoke"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:513
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6714,13 +7100,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:519
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:477
+#: apt.conf.5.xml:520
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6736,7 +7122,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:526
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6752,13 +7138,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:533
msgid "Run-Directory"
msgstr "Run-Directory"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:534
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6768,13 +7154,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:538
msgid "Build-options"
msgstr "Build-options"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:539
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6783,12 +7169,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:544
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:545
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 "
@@ -6803,7 +7189,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:560
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6813,7 +7199,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:554
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 "
@@ -6827,17 +7213,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:566
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:567
msgid ""
-"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"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 then this flag is present unless it is "
-"explicit called to do so in an extra call. Note that this option exists "
+"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 add these flag also to the unpack and remove calls."
@@ -6845,13 +7231,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:574
#, fuzzy
+#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:575
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6860,37 +7247,37 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next option. "
"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally relay on dpkg for configuration (which will at the moment fail if a "
+"totally rely on dpkg for configuration (which will at the moment fail if a "
"Pre-Depends is encountered). Setting this option to another than the all "
-"value will implicit activate also the next option per default as otherwise "
+"value will implicitly 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:542
+#: apt.conf.5.xml:585
#, fuzzy
msgid "DPkg::ConfigurePending"
msgstr "ユーザの設定"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:586
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 the previous option is not set "
"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In this sceneries "
+"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><term>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:592
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:593
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6900,12 +7287,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:555
+#: apt.conf.5.xml:598
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:599
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6917,12 +7304,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:606
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:614
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6934,7 +7321,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:607
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -6948,12 +7335,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:627
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:628
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6967,12 +7354,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:636
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:638
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6983,7 +7370,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:649
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6994,7 +7381,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:657
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7005,7 +7392,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:623
+#: apt.conf.5.xml:666
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7015,66 +7402,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:631
+#: apt.conf.5.xml:674
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:641
+#: apt.conf.5.xml:684
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:689
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:650
+#: apt.conf.5.xml:693
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:657
+#: apt.conf.5.xml:700
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:661
+#: apt.conf.5.xml:704
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:711
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:672
+#: apt.conf.5.xml:715
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:722
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:683
+#: apt.conf.5.xml:726
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:733
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:694
+#: apt.conf.5.xml:737
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7082,46 +7469,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:744
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:748
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:712
+#: apt.conf.5.xml:755
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:758
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:765
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:768
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:732
+#: apt.conf.5.xml:775
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:778
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 "
@@ -7129,93 +7516,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:786
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:789
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:754
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:801
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:765
+#: apt.conf.5.xml:808
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:768
+#: apt.conf.5.xml:811
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:775
+#: apt.conf.5.xml:818
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:778
+#: apt.conf.5.xml:821
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:786
+#: apt.conf.5.xml:829
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:790
+#: apt.conf.5.xml:833
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:797
+#: apt.conf.5.xml:840
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:801
+#: apt.conf.5.xml:844
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:808
+#: apt.conf.5.xml:851
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:855
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:819
+#: apt.conf.5.xml:862
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:822
+#: apt.conf.5.xml:865
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7225,12 +7612,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:876
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:836
+#: apt.conf.5.xml:879
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7247,91 +7634,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:901
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:908
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:911
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:876
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:922
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:886
+#: apt.conf.5.xml:929
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:933
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:898
+#: apt.conf.5.xml:941
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:945
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:952
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:956
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:962
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:966
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:931
+#: apt.conf.5.xml:974
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:934
+#: apt.conf.5.xml:977
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 "
@@ -7339,12 +7726,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:985
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:989
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7352,7 +7739,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1012
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7362,15 +7749,16 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:975
+#: apt.conf.5.xml:1019
#, fuzzy
+#| msgid "&apt-conf;"
msgid "&file-aptconf;"
msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1024
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7396,6 +7784,10 @@ msgstr "APT 設定制御ファイル"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
#, fuzzy
+#| msgid ""
+#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
+#| "used to control which versions of packages will be selected for "
+#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -8630,6 +9022,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:617
#, fuzzy
+#| msgid "apt_preferences"
msgid "&file-preferences;"
msgstr "apt_preferences"
@@ -8654,11 +9047,17 @@ msgstr "APT 用パッケージリソースリスト"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
+#, fuzzy
+#| msgid ""
+#| "The package resource list is used to locate archives of the package "
+#| "distribution system in use on the system. At this time, this manual page "
+#| "documents only the packaging system used by the Debian GNU/Linux system. "
+#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is located in <filename>/etc/apt/sources.list</filename>"
+"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム"
@@ -8668,12 +9067,22 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
+#, fuzzy
+#| msgid ""
+#| "The source list is designed to support any number of active sources and a "
+#| "variety of source media. The file lists one source per line, with the "
+#| "most preferred source listed first. The format of each line is: "
+#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#| "determines the format for <literal>args</literal> <literal>uri</literal> "
+#| "is a Universal Resource Identifier (URI), which is a superset of the more "
+#| "specific and well-known Universal Resource Locator, or URL. The rest of "
+#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -8718,13 +9127,24 @@ msgstr "deb タイプと deb-src タイプ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. Typically, "
+#| "<literal>distribution</literal> is generally one of <literal>stable</"
+#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
+#| "component is one of <literal>main</literal> <literal>contrib</literal> "
+#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
+#| "src</literal> type describes a debian distribution's source code in the "
+#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
+#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
"<literal>distribution</literal> is generally one of <literal>stable</"
"literal> <literal>unstable</literal> or <literal>testing</literal> while "
"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
+"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
"src</literal> type describes a debian distribution's source code in the same "
"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line "
"is required to fetch source indexes."
@@ -8742,9 +9162,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types are:"
+"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
"<literal>deb</literal> タイプと <literal>deb-src</literal> タイプで使用する "
"<filename>sources.list</filename> エントリのフォーマットは、以下のようになり"
@@ -8759,13 +9183,23 @@ msgstr "deb uri distribution [component1] [component2] [...]"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (/). This is useful for when only a particular sub-"
+#| "section of the archive denoted by the URI is of interest. If "
+#| "<literal>distribution</literal> does not specify an exact path, at least "
+#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when only a particular sub-section of the "
-"archive denoted by the URI is of interest. If <literal>distribution</"
+"a slash (/). This is useful for when the case only a particular sub-section "
+"of the archive denoted by the URI is of interest. If <literal>distribution</"
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
@@ -8890,12 +9324,20 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "The http scheme specifies an HTTP server for the archive. If an "
+#| "environment variable <envar>http_proxy</envar> is set with the format "
+#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#| "string of the format http://user:pass@server:port/ Note that this is an "
+#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/ Note that this is an insecure method of "
+"http://user:pass@server:port/. Note that this is an insecure method of "
"authentication."
msgstr ""
"http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
@@ -8967,6 +9409,24 @@ msgstr ""
"準の <command>find</command> コマンドや <command>dd</command> コマンドを使用"
"します。"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:178
+msgid "more recongnizable URI types"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:180
+msgid ""
+"APT can be extended with more methods shipped in other optional packages "
+"which should follow the nameing scheme <literal>apt-transport-"
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"also the <literal>apt-transport-https</literal> package which provides "
+"access methods for https-URIs with features similiar to the http method, but "
+"other methods for using e.g. debtorrent are also available, see "
+"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
+"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
+msgstr ""
+
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
@@ -8979,7 +9439,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:194
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8988,38 +9448,38 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:196
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:198
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:187
+#: sources.list.5.xml:199
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:201
msgid "Source line for the above"
msgstr "上記のソース行"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:202
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:192
+#: sources.list.5.xml:204
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9029,14 +9489,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:206
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:208
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
@@ -9046,19 +9506,25 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:210
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:212
+#, fuzzy
+#| msgid ""
+#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
+#| "directory, and uses only the unstable/contrib area. If this line appears "
+#| "as well as the one in the previous example in <filename>sources.list</"
+#| "filename>. a single FTP session will be used for both resource lines."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</"
-"filename>. a single FTP session will be used for both resource lines."
+"well as the one in the previous example in <filename>sources.list</filename> "
+"a single FTP session will be used for both resource lines."
msgstr ""
"ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
"unstable/contrib を使用します。<filename>sources.list</filename> に上記サンプ"
@@ -9067,14 +9533,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:216
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:218
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -9083,20 +9549,20 @@ msgstr ""
"下を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:222
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9115,10 +9581,1156 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:234
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
+#. type: <title></title>
+#: guide.sgml:4
+msgid "APT User's Guide"
+msgstr ""
+
+# type: <author></author>
+#. type: <author></author>
+#: guide.sgml:6 offline.sgml:6
+msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+
+#. type: <version></version>
+#: guide.sgml:7
+msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+msgstr ""
+
+#. type: <abstract></abstract>
+#: guide.sgml:11
+msgid ""
+"This document provides an overview of how to use the the APT package manager."
+msgstr ""
+
+# type: <copyrightsummary></copyrightsummary>
+#. type: <copyrightsummary></copyrightsummary>
+#: guide.sgml:15
+#, fuzzy
+msgid "Copyright &copy; Jason Gunthorpe, 1998."
+msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
+#. type: <p></p>
+#: guide.sgml:21 offline.sgml:22
+msgid ""
+"\"APT\" and this document are free software; you can redistribute them and/"
+"or modify them under the terms of the GNU General Public License as "
+"published by the Free Software Foundation; either version 2 of the License, "
+"or (at your option) any later version."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:24 offline.sgml:25
+msgid ""
+"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"common-licenses/GPL for the full license."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:32
+#, fuzzy
+msgid "General"
+msgstr "generate"
+
+#. type: <p></p>
+#: guide.sgml:38
+msgid ""
+"The APT package currently contains two sections, the APT <prgn>dselect</"
+"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
+"provide a way to install and remove packages as well as download new "
+"packages from the Internet."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#. type: <heading></heading>
+#: guide.sgml:39
+#, fuzzy
+msgid "Anatomy of the Package System"
+msgstr "パッケージ名"
+
+#. type: <p></p>
+#: guide.sgml:44
+msgid ""
+"The Debian packaging system has a large amount of information associated "
+"with each package to help assure that it integrates cleanly and easily into "
+"the system. The most prominent of its features is the dependency system."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:52
+msgid ""
+"The dependency system allows individual programs to make use of shared "
+"elements in the system such as libraries. It simplifies placing infrequently "
+"used portions of a program in separate packages to reduce the number of "
+"things the average user is required to install. Also, it allows for choices "
+"in mail transport agents, X servers and so on."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:57
+msgid ""
+"The first step to understanding the dependency system is to grasp the "
+"concept of a simple dependency. The meaning of a simple dependency is that a "
+"package requires another package to be installed at the same time to work "
+"properly."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:63
+msgid ""
+"For instance, mailcrypt is an emacs extension that aids in encrypting email "
+"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"simple dependency on GPG. Also, because it is an emacs extension it has a "
+"simple dependency on emacs, without emacs it is completely useless."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:73
+msgid ""
+"The other important dependency to understand is a conflicting dependency. It "
+"means that a package, when installed with another package, will not work and "
+"may possibly be extremely harmful to the system. As an example consider a "
+"mail transport agent such as sendmail, exim or qmail. It is not possible to "
+"have two mail transport agents installed because both need to listen to the "
+"network to receive mail. Attempting to install two will seriously damage the "
+"system so all mail transport agents have a conflicting dependency with all "
+"other mail transport agents."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:83
+msgid ""
+"As an added complication there is the possibility for a package to pretend "
+"to be another package. Consider that exim and sendmail for many intents are "
+"identical, they both deliver mail and understand a common interface. Hence, "
+"the package system has a way for them to declare that they are both mail-"
+"transport-agents. So, exim and sendmail both declare that they provide a "
+"mail-transport-agent and other packages that need a mail transport agent "
+"depend on mail-transport-agent. This can add a great deal of confusion when "
+"trying to manually fix packages."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:88
+msgid ""
+"At any given time a single dependency may be met by packages that are "
+"already installed or it may not be. APT attempts to help resolve dependency "
+"issues by providing a number of automatic algorithms that help in selecting "
+"packages for installation."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:102
+msgid ""
+"<prgn>apt-get</prgn> provides a simple way to install packages from the "
+"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
+"understand .deb files, it works with the package's proper name and can only "
+"install .deb archives from a <em>Source</em>."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:109
+msgid ""
+"The first <footnote><p>If you are using an http proxy server you must set "
+"the http_proxy environment variable first, see sources.list(5)</p></"
+"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
+"fetch the package lists from the <em>Sources</em> so that it knows what "
+"packages are available. This is done with <tt>apt-get update</tt>. For "
+"instance,"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:116
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p><taglist>
+#: guide.sgml:120
+msgid "Once updated there are several commands that can be used:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:131
+msgid ""
+"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
+"install a new package or remove an existing package, nor will it ever "
+"upgrade a package that might cause some other package to break. This can be "
+"used daily to relatively safely upgrade the system. Upgrade will list all of "
+"the packages that it could not upgrade, this usually means that they depend "
+"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
+"<tt>apt-get install</tt> can be used to force these packages to install."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:140
+msgid ""
+"Install is used to install packages by name. The package is automatically "
+"fetched and installed. This can be useful if you already know the name of "
+"the package to install and do not want to go into a GUI to select it. Any "
+"number of packages may be passed to install, they will all be fetched. "
+"Install automatically attempts to resolve dependency problems with the "
+"listed packages and will print a summary and ask for confirmation if "
+"anything other than its arguments are changed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:149
+msgid ""
+"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
+"releases of Debian. It uses a sophisticated algorithm to determine the best "
+"set of packages to install, upgrade and remove to get as much of the system "
+"to the newest release. In some situations it may be desired to use dist-"
+"upgrade rather than spend the time manually resolving dependencies in "
+"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
+"prgn> can be used to install any packages that may have been left out."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:152
+msgid ""
+"It is important to closely look at what dist-upgrade is going to do, its "
+"decisions may sometimes be quite surprising."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:163
+msgid ""
+"<prgn>apt-get</prgn> has several command line options that are detailed in "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"option is <tt>-d</tt> which does not install the fetched files. If the "
+"system has to download a large number of package it would be undesired to "
+"start installing them in case something goes wrong. When <tt>-d</tt> is used "
+"the downloaded archives can be installed by simply running the command that "
+"caused them to be downloaded again without <tt>-d</tt>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#. type: <heading></heading>
+#: guide.sgml:168
+msgid "DSelect"
+msgstr "DSelect"
+
+#. type: <p></p>
+#: guide.sgml:173
+msgid ""
+"The APT <prgn>dselect</prgn> method provides the complete APT system with "
+"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
+"to select the packages to be installed or removed and APT actually installs "
+"them."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:184
+msgid ""
+"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
+"prgn> and then choose the APT method. You will be prompted for a set of "
+"<em>Sources</em> which are places to fetch archives from. These can be "
+"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"provide a fragment of the total Debian archive, APT will automatically "
+"combine them to form a complete set of packages. If you have a CDROM then it "
+"is a good idea to specify it first and then specify a mirror so that you "
+"have access to the latest bug fixes. APT will automatically use packages on "
+"your CDROM before downloading from the Internet."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:198
+#, no-wrap
+msgid ""
+" Set up a list of distribution source locations\n"
+"\t \n"
+" Please give the base URL of the debian distribution.\n"
+" The access schemes I know about are: http file\n"
+"\t \n"
+" For example:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:205
+msgid ""
+"The <em>Sources</em> setup starts by asking for the base of the Debian "
+"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
+"get."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:212
+#, no-wrap
+msgid ""
+" Please give the distribution tag to get or a path to the\n"
+" package file ending in a /. The distribution\n"
+" tags are typically something like: stable unstable testing non-US\n"
+" \n"
+" Distribution [stable]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:222
+msgid ""
+"The distribution refers to the Debian version in the archive, <em>stable</"
+"em> refers to the latest released version and <em>unstable</em> refers to "
+"the developmental version. <em>non-US</em> is only available on some mirrors "
+"and refers to packages that contain encryption technology or other things "
+"that cannot be exported from the United States. Importing these packages "
+"into the US is legal however."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:228
+#, no-wrap
+msgid ""
+" Please give the components to get\n"
+" The components are typically something like: main contrib non-free\n"
+" \n"
+" Components [main contrib non-free]:"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:236
+msgid ""
+"The components list refers to the list of sub distributions to fetch. The "
+"distribution is split up based on software licenses, main being DFSG free "
+"packages while contrib and non-free contain things that have various "
+"restrictions placed on their use and distribution."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:240
+msgid ""
+"Any number of sources can be added, the setup script will continue to prompt "
+"until you have specified all that you want."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:247
+msgid ""
+"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+"available list by selecting [U]pdate from the menu. This is a super-set of "
+"<tt>apt-get update</tt> that makes the fetched information available to "
+"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
+"tt> has been run before."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:253
+msgid ""
+"You can then go on and make your selections using [S]elect and then perform "
+"the installation using [I]nstall. When using the APT method the [C]onfig and "
+"[R]emove commands have no meaning, the [I]nstall command performs both of "
+"them together."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:258
+msgid ""
+"By default APT will automatically remove the package (.deb) files once they "
+"have been successfully installed. To change this behavior place <tt>Dselect::"
+"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+msgstr ""
+
+# type: <tag></tag>
+#. type: <heading></heading>
+#: guide.sgml:264
+#, fuzzy
+msgid "The Interface"
+msgstr "メソッドインスタンス"
+
+#. type: <p></p>
+#: guide.sgml:278
+msgid ""
+"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
+"same interface. It is a simple system that generally tells you what it will "
+"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
+"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
+"actually provides more functionality than is present in <prgn>apt-get</prgn> "
+"alone.</p></footnote> After printing out a summary of what will happen APT "
+"then will print out some informative status messages so that you can "
+"estimate how far along it is and how much is left to do."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:280
+msgid "Startup"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:284
+msgid ""
+"Before all operations except update, APT performs a number of actions to "
+"prepare its internal state. It also does some checks of the system's state. "
+"At any time these operations can be performed by running <tt>apt-get check</"
+"tt>."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:289
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:297
+msgid ""
+"The first thing it does is read all the package files into memory. APT uses "
+"a caching scheme so this operation will be faster the second time it is run. "
+"If some of the package files are not found then they will be ignored and a "
+"warning will be printed when apt-get exits."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:303
+msgid ""
+"The final operation performs a detailed analysis of the system's "
+"dependencies. It checks every dependency of every installed or unpacked "
+"package and considers if it is OK. Should this find a problem then a report "
+"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:320
+#, no-wrap
+msgid ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done\n"
+"You might want to run apt-get -f install' to correct these.\n"
+"Sorry, but the following packages have unmet dependencies:\n"
+" 9fonts: Depends: xlib6g but it is not installed\n"
+" uucp: Depends: mailx but it is not installed\n"
+" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" adduser: Depends: perl-base but it is not installed\n"
+" aumix: Depends: libgpmg1 but it is not installed\n"
+" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 but it is not installed\n"
+" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:329
+msgid ""
+"In this example the system has many problems, including a serious problem "
+"with libreadlineg2. For each package that has unmet dependencies a line is "
+"printed out indicating the package with the problem and the dependencies "
+"that are unmet. A short explanation of why the package has a dependency "
+"problem is also included."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:337
+msgid ""
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
+"packages when performing upgrades. <footnote><p>APT however considers all "
+"known dependencies and attempts to prevent broken packages</p></footnote>. "
+"The second is if a package installation fails during an operation. In this "
+"situation a package may have been unpacked without its dependents being "
+"installed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:345
+msgid ""
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
+"deduce a possible solution to the problem and then continue on. The APT "
+"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
+"for easy continuation of failed maintainer scripts."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:351
+msgid ""
+"However, if the <tt>-f</tt> option is used to correct a seriously broken "
+"system caused by the first case then it is possible that it will either fail "
+"immediately or the installation sequence will fail. In either case it is "
+"necessary to manually use dpkg (possibly with forcing options) to correct "
+"the situation enough to allow APT to proceed."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:356
+msgid "The Status Report"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:363
+msgid ""
+"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
+"happen. Generally the report reflects the type of operation being performed "
+"but there are several common elements. In all cases the lists reflect the "
+"final state of things, taking into account the <tt>-f</tt> option and any "
+"other relevant activities to the command being executed."
+msgstr ""
+
+# type: <tag></tag>
+#. type: <heading></heading>
+#: guide.sgml:364
+#, fuzzy
+msgid "The Extra Package list"
+msgstr "NextPackage"
+
+#. type: <example></example>
+#: guide.sgml:372
+#, no-wrap
+msgid ""
+"The following extra packages will be installed:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:379
+msgid ""
+"The Extra Package list shows all of the packages that will be installed or "
+"upgraded in excess of the ones mentioned on the command line. It is only "
+"generated for an <tt>install</tt> command. The listed packages are often the "
+"result of an Auto Install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:382
+msgid "The Packages to Remove"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:389
+#, no-wrap
+msgid ""
+"The following packages will be REMOVED:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:399
+msgid ""
+"The Packages to Remove list shows all of the packages that will be removed "
+"from the system. It can be shown for any of the operations and should be "
+"given a careful inspection to ensure nothing important is to be taken off. "
+"The <tt>-f</tt> option is especially good at generating packages to remove "
+"so extreme care should be used in that case. The list may contain packages "
+"that are going to be removed because they are only partially installed, "
+"possibly due to an aborted installation."
+msgstr ""
+
+# type: <tag></tag>
+#. type: <heading></heading>
+#: guide.sgml:402
+#, fuzzy
+msgid "The New Packages list"
+msgstr "NextPackage"
+
+#. type: <example></example>
+#: guide.sgml:406
+#, no-wrap
+msgid ""
+"The following NEW packages will installed:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:411
+msgid ""
+"The New Packages list is simply a reminder of what will happen. The packages "
+"listed are not presently installed in the system but will be when APT is "
+"done."
+msgstr ""
+
+# type: <tag></tag>
+#. type: <heading></heading>
+#: guide.sgml:414
+#, fuzzy
+msgid "The Kept Back list"
+msgstr "NextPackage"
+
+#. type: <example></example>
+#: guide.sgml:419
+#, no-wrap
+msgid ""
+"The following packages have been kept back\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:428
+msgid ""
+"Whenever the whole system is being upgraded there is the possibility that "
+"new versions of packages cannot be installed because they require new things "
+"or conflict with already installed things. In this case the package will "
+"appear in the Kept Back list. The best way to convince packages listed there "
+"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
+"to resolve their problems."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:431
+msgid "Held Packages warning"
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:435
+#, no-wrap
+msgid ""
+"The following held packages will be changed:\n"
+" cvs"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:441
+msgid ""
+"Sometimes you can ask APT to install a package that is on hold, in such a "
+"case it prints out a warning that the held package is going to be changed. "
+"This should only happen during dist-upgrade or install."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:444
+msgid "Final summary"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:447
+msgid ""
+"Finally, APT will print out a summary of all the changes that will occur."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:452
+#, no-wrap
+msgid ""
+"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
+"12 packages not fully installed or removed.\n"
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:470
+msgid ""
+"The first line of the summary simply is a reduced version of all of the "
+"lists and includes the number of upgrades - that is packages already "
+"installed that have new versions available. The second line indicates the "
+"number of poorly configured packages, possibly the result of an aborted "
+"installation. The final line shows the space requirements that the "
+"installation needs. The first pair of numbers refer to the size of the "
+"archive files. The first number indicates the number of bytes that must be "
+"fetched from remote locations and the second indicates the total size of all "
+"the archives required. The next number indicates the size difference between "
+"the presently installed packages and the newly installed packages. It is "
+"roughly equivalent to the space required in /usr after everything is done. "
+"If a large number of packages are being removed then the value may indicate "
+"the amount of space that will be freed."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:473
+msgid ""
+"Some other reports can be generated by using the -u option to show packages "
+"to upgrade, they are similar to the previous examples."
+msgstr ""
+
+#. type: <heading></heading>
+#: guide.sgml:477
+msgid "The Status Display"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:481
+msgid ""
+"During the download of archives and package files APT prints out a series of "
+"status messages."
+msgstr ""
+
+#. type: <example></example>
+#: guide.sgml:490
+#, no-wrap
+msgid ""
+"# apt-get update\n"
+"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:500
+msgid ""
+"The lines starting with <em>Get</em> are printed out when APT begins to "
+"fetch a file while the last line indicates the progress of the download. The "
+"first percent value on the progress line indicates the total percent done of "
+"all files. Unfortunately since the size of the Package files is unknown "
+"<tt>apt-get update</tt> estimates the percent done which causes some "
+"inaccuracies."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:509
+msgid ""
+"The next section of the status line is repeated once for each download "
+"thread and indicates the operation being performed and some useful "
+"information about what is happening. Sometimes this section will simply read "
+"<em>Forking</em> which means the OS is loading the download module. The "
+"first word after the [ is the fetch number as shown on the history lines. "
+"The next word is the short form name of the object being downloaded. For "
+"archives it will contain the name of the package that is being fetched."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:524
+msgid ""
+"Inside of the single quote is an informative string indicating the progress "
+"of the negotiation phase of the download. Typically it progresses from "
+"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
+"<em>Resuming</em>. The final value is the number of bytes downloaded from "
+"the remote site. Once the download begins this is represented as "
+"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
+"kilobytes is expected. The total size is always shown in 4 figure notation "
+"to preserve space. After the size display is a percent meter for the file "
+"itself. The second last element is the instantaneous average speed. This "
+"values is updated every 5 seconds and reflects the rate of data transfer for "
+"that period. Finally is shown the estimated transfer time. This is updated "
+"regularly and reflects the time to complete everything at the shown transfer "
+"rate."
+msgstr ""
+
+#. type: <p></p>
+#: guide.sgml:530
+msgid ""
+"The status display updates every half second to provide a constant feedback "
+"on the download progress while the Get lines scroll back whenever a new file "
+"is started. Since the status display is constantly updated it is unsuitable "
+"for logging to a file, use the <tt>-q</tt> option to remove the status "
+"display."
+msgstr ""
+
+# type: <heading></heading>
+#. type: <heading></heading>
+#: guide.sgml:535
+msgid "Dpkg"
+msgstr "Dpkg"
+
+#. type: <p></p>
+#: guide.sgml:542
+msgid ""
+"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
+"to the <prgn>dpkg</prgn> interface once downloading is completed. "
+"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
+"packages and the packages themselves may also ask several questions. Before "
+"each question there is usually a description of what it is asking and the "
+"questions are too varied to discuss completely here."
+msgstr ""
+
+# type: <title></title>
+#. type: <title></title>
+#: offline.sgml:4
+msgid "Using APT Offline"
+msgstr "オフラインでの APT の使用法"
+
+#. type: <version></version>
+#: offline.sgml:7
+msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+msgstr ""
+
+# type: <abstract></abstract>
+#. type: <abstract></abstract>
+#: offline.sgml:12
+msgid ""
+"This document describes how to use APT in a non-networked environment, "
+"specifically a 'sneaker-net' approach for performing upgrades."
+msgstr ""
+"このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
+"具体的には、アップグレード時に「スニーカーネット」アプローチです。"
+
+# type: <copyrightsummary></copyrightsummary>
+#. type: <copyrightsummary></copyrightsummary>
+#: offline.sgml:16
+msgid "Copyright &copy; Jason Gunthorpe, 1999."
+msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
+# type: Content of: <refentry><refsect1><title>
+#. type: <heading></heading>
+#: offline.sgml:32
+msgid "Introduction"
+msgstr "はじめに"
+
+#. type: <heading></heading>
+#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#, fuzzy
+msgid "Overview"
+msgstr "OverrideDir"
+
+#. type: <p></p>
+#: offline.sgml:40
+msgid ""
+"Normally APT requires direct access to a Debian archive, either from a local "
+"media or through a network. Another common complaint is that a Debian "
+"machine is on a slow link, such as a modem and another machine has a very "
+"fast connection but they are physically distant."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:51
+msgid ""
+"The solution to this is to use large removable media such as a Zip disc or a "
+"SuperDisk disc. These discs are not large enough to store the entire Debian "
+"archive but can easily fit a subset large enough for most users. The idea is "
+"to use APT to generate a list of packages that are required and then fetch "
+"them onto the disc using another machine with good connectivity. It is even "
+"possible to use another Debian machine with APT or to use a completely "
+"different OS and a download tool like wget. Let <em>remote host</em> mean "
+"the machine downloading the packages, and <em>target host</em> the one with "
+"bad or no connection."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:57
+msgid ""
+"This is achieved by creatively manipulating the APT configuration file. The "
+"essential premis to tell APT to look on a disc for it's archive files. Note "
+"that the disc should be formated with a filesystem that can handle long file "
+"names such as ext2, fat32 or vfat."
+msgstr ""
+
+# type: <title></title>
+#. type: <heading></heading>
+#: offline.sgml:63
+#, fuzzy
+msgid "Using APT on both machines"
+msgstr "オフラインでの APT の使用法"
+
+#. type: <p><example>
+#: offline.sgml:71
+msgid ""
+"APT being available on both machines gives the simplest configuration. The "
+"basic idea is to place a copy of the status file on the disc and use the "
+"remote machine to fetch the latest package files and decide which packages "
+"to download. The disk directory structure should look like:"
+msgstr ""
+
+# type: <example></example>
+#. type: <example></example>
+#: offline.sgml:80
+#, no-wrap
+msgid ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
+msgstr ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
+
+# type: Content of: <refentry><refsect1><title>
+#. type: <heading></heading>
+#: offline.sgml:88
+#, fuzzy
+msgid "The configuration file"
+msgstr "ユーザの設定"
+
+#. type: <p></p>
+#: offline.sgml:96
+msgid ""
+"The configuration file should tell APT to store its files on the disc and to "
+"use the configuration files on the disc as well. The sources.list should "
+"contain the proper sites that you wish to use from the remote machine, and "
+"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
+"<em>target host</em>. Please note, if you are using a local archive you must "
+"use copy URIs, the syntax is identical to file URIs."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:100
+msgid ""
+"<em>apt.conf</em> must contain the necessary information to make APT use the "
+"disc:"
+msgstr ""
+
+# type: <example></example>
+#. type: <example></example>
+#: offline.sgml:124
+#, fuzzy, no-wrap
+msgid ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it tells\n"
+" the remote APT what architecture the target machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
+msgstr ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it tells\n"
+" the remote APT what architecture the Debian machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
+
+#. type: </example></p>
+#: offline.sgml:129
+msgid ""
+"More details can be seen by examining the apt.conf man page and the sample "
+"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:136
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy <em>/"
+"var/lib/dpkg/status</em> to it. You will also need to create the directories "
+"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
+"em> Then take the disc to the remote machine and configure the sources.list. "
+"On the remote machine execute the following:"
+msgstr ""
+
+# type: <example></example>
+#. type: <example></example>
+#: offline.sgml:142
+#, fuzzy, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT fetches the package files ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT fetches all the packages needed to upgrade the target machine ]"
+msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ パッケージファイルを取得します ]\n"
+" # apt-get dist-upgrade\n"
+" [ アップグレードが必要な全パッケージを取得します ]"
+
+#. type: </example></p>
+#: offline.sgml:149
+msgid ""
+"The dist-upgrade command can be replaced with any-other standard APT "
+"commands, particularly dselect-upgrade. You can even use an APT front end "
+"such as <em>dselect</em> However this presents a problem in communicating "
+"your selections back to the local computer."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:153
+msgid ""
+"Now the disc contains all of the index files and archives needed to upgrade "
+"the target machine. Take the disc back and run:"
+msgstr ""
+
+# type: <example></example>
+#. type: <example></example>
+#: offline.sgml:159
+#, fuzzy, no-wrap
+msgid ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT generates a local copy of the cache files ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Or any other APT command ]"
+msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ パッケージファイルを取得します ]\n"
+" # apt-get dist-upgrade\n"
+" [ アップグレードが必要な全パッケージを取得します ]"
+
+#. type: <p></p>
+#: offline.sgml:165
+msgid ""
+"It is necessary for proper function to re-specify the status file to be the "
+"local one. This is very important!"
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:172
+msgid ""
+"If you are using dselect you can do the very risky operation of copying disc/"
+"status to /var/lib/dpkg/status so that any selections you made on the remote "
+"machine are updated. I highly recommend that people only make selections on "
+"the local machine - but this may not always be possible. DO NOT copy the "
+"status file if dpkg or APT have been run in the mean time!!"
+msgstr ""
+
+# type: <title></title>
+#. type: <heading></heading>
+#: offline.sgml:178
+#, fuzzy
+msgid "Using APT and wget"
+msgstr "オフラインでの APT の使用法"
+
+#. type: <p></p>
+#: offline.sgml:185
+msgid ""
+"<em>wget</em> is a popular and portable download tool that can run on nearly "
+"any machine. Unlike the method above this requires that the Debian machine "
+"already has a list of available packages."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:190
+msgid ""
+"The basic idea is to create a disc that has only the archive files "
+"downloaded from the remote site. This is done by using the --print-uris "
+"option to apt-get and then preparing a wget script to actually fetch the "
+"packages."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#. type: <heading></heading>
+#: offline.sgml:196
+#, fuzzy
+msgid "Operation"
+msgstr "オプション"
+
+#. type: <p><example>
+#: offline.sgml:200
+msgid ""
+"Unlike the previous technique no special configuration files are required. "
+"We merely use the standard APT commands to generate the file list."
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:205
+#, no-wrap
+msgid ""
+" # apt-get dist-upgrade \n"
+" [ Press no when prompted, make sure you are happy with the actions ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:210
+msgid ""
+"Any command other than dist-upgrade could be used here, including dselect-"
+"upgrade."
+msgstr ""
+
+#. type: <p></p>
+#: offline.sgml:216
+msgid ""
+"The /disc/wget-script file will now contain a list of wget commands to "
+"execute in order to fetch the necessary archives. This script should be run "
+"with the current directory as the disc's mount point so as to save the "
+"output on the disc."
+msgstr ""
+
+#. type: <p><example>
+#: offline.sgml:219
+msgid "The remote machine would do something like"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:223
+#, no-wrap
+msgid ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ wait.. ]"
+msgstr ""
+
+#. type: </example><example>
+#: offline.sgml:228
+msgid ""
+"Once the archives are downloaded and the disc returned to the Debian machine "
+"installation can proceed using,"
+msgstr ""
+
+#. type: <example></example>
+#: offline.sgml:230
+#, no-wrap
+msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgstr ""
+
+#. type: </example></p>
+#: offline.sgml:234
+msgid "Which will use the already fetched archives on the disc."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Disable Immediate Configuration; This dangerous option disables some of "
+#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+#~ "necessary on some extremely slow single user systems but is very "
+#~ "dangerous and may cause package install scripts to fail or worse. Use at "
+#~ "your own risk."
+#~ msgstr ""
+#~ "即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg "
+#~ "の呼び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシ"
+#~ "ステムでは必要かもしれませんが、非常に危険で、パッケージのインストールスク"
+#~ "リプトが失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任"
+#~ "で使用してください。"
+
# type: Content of: <refentry><refnamediv><refname>
#, fuzzy
#~ msgid "NoConfigure"
@@ -9180,18 +10792,10 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "<filename>&cachedir;/archives/partial/</filename>"
#~ msgstr "<filename>&cachedir;/archives/partial/</filename>"
-# type: <author></author>
-#~ msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-
# type: <copyrightsummary></copyrightsummary>
#~ msgid "Copyright &copy; Jason Gunthorpe, 1997-1998."
#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Introduction"
-#~ msgstr "はじめに"
-
# type: Content of: <refentry><refnamediv><refpurpose>
#, fuzzy
#~ msgid "Note on Pointer access"
@@ -9777,10 +11381,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
#, fuzzy
-#~ msgid "General"
-#~ msgstr "generate"
-
-#, fuzzy
#~ msgid ""
#~ "deb <var>uri</var> <var>distribution</var> <var>component</var> "
#~ "[<var>component</var> ...]"
@@ -9863,34 +11463,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "The Release File"
#~ msgstr "ソースオーバーライドファイル"
-# type: <copyrightsummary></copyrightsummary>
-#, fuzzy
-#~ msgid "Copyright &copy; Jason Gunthorpe, 1998."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
-
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#, fuzzy
-#~ msgid "Anatomy of the Package System"
-#~ msgstr "パッケージ名"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "DSelect"
-#~ msgstr "DSelect"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "The Extra Package list"
-#~ msgstr "NextPackage"
-
-# type: <heading></heading>
-#~ msgid "Dpkg"
-#~ msgstr "Dpkg"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "APT Method Interface"
-#~ msgstr "メソッドインスタンス"
-
# type: Content of: <refentry><refsect1><title>
#~ msgid "Global configuration"
#~ msgstr "共通設定"
@@ -9921,10 +11493,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "Specification"
#~ msgstr "仕様"
-#, fuzzy
-#~ msgid "Overview"
-#~ msgstr "OverrideDir"
-
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#, fuzzy
#~ msgid "601 Configuration - Sends the configuration space"
@@ -9987,147 +11555,5 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "Notes"
#~ msgstr "contents"
-# type: <title></title>
-#~ msgid "Using APT Offline"
-#~ msgstr "オフラインでの APT の使用法"
-
-# type: <abstract></abstract>
-#~ msgid ""
-#~ "This document describes how to use APT in a non-networked environment, "
-#~ "specifically a 'sneaker-net' approach for performing upgrades."
-#~ msgstr ""
-#~ "このドキュメントはネットワークがない環境での APT の使用方法を説明していま"
-#~ "す。具体的には、アップグレード時に「スニーカーネット」アプローチです。"
-
-# type: <copyrightsummary></copyrightsummary>
-#~ msgid "Copyright &copy; Jason Gunthorpe, 1999."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
-
-# type: <title></title>
-#, fuzzy
-#~ msgid "Using APT on both machines"
-#~ msgstr "オフラインでの APT の使用法"
-
-# type: <example></example>
-#~ msgid ""
-#~ " /disc/\n"
-#~ " archives/\n"
-#~ " partial/\n"
-#~ " lists/\n"
-#~ " partial/\n"
-#~ " status\n"
-#~ " sources.list\n"
-#~ " apt.conf"
-#~ msgstr ""
-#~ " /disc/\n"
-#~ " archives/\n"
-#~ " partial/\n"
-#~ " lists/\n"
-#~ " partial/\n"
-#~ " status\n"
-#~ " sources.list\n"
-#~ " apt.conf"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "The configuration file"
-#~ msgstr "ユーザの設定"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid ""
-#~ " APT\n"
-#~ " {\n"
-#~ " /* This is not necessary if the two machines are the same arch, it "
-#~ "tells\n"
-#~ " the remote APT what architecture the target machine is */\n"
-#~ " Architecture \"i386\";\n"
-#~ " \n"
-#~ " Get::Download-Only \"true\";\n"
-#~ " };\n"
-#~ " \n"
-#~ " Dir\n"
-#~ " {\n"
-#~ " /* Use the disc for state information and redirect the status file "
-#~ "from\n"
-#~ " the /var/lib/dpkg default */\n"
-#~ " State \"/disc/\";\n"
-#~ " State::status \"status\";\n"
-#~ "\n"
-#~ " // Binary caches will be stored locally\n"
-#~ " Cache::archives \"/disc/archives/\";\n"
-#~ " Cache \"/tmp/\";\n"
-#~ " \n"
-#~ " // Location of the source list.\n"
-#~ " Etc \"/disc/\";\n"
-#~ " };"
-#~ msgstr ""
-#~ " APT\n"
-#~ " {\n"
-#~ " /* This is not necessary if the two machines are the same arch, it "
-#~ "tells\n"
-#~ " the remote APT what architecture the Debian machine is */\n"
-#~ " Architecture \"i386\";\n"
-#~ " \n"
-#~ " Get::Download-Only \"true\";\n"
-#~ " };\n"
-#~ " \n"
-#~ " Dir\n"
-#~ " {\n"
-#~ " /* Use the disc for state information and redirect the status file "
-#~ "from\n"
-#~ " the /var/lib/dpkg default */\n"
-#~ " State \"/disc/\";\n"
-#~ " State::status \"status\";\n"
-#~ "\n"
-#~ " // Binary caches will be stored locally\n"
-#~ " Cache::archives \"/disc/archives/\";\n"
-#~ " Cache \"/tmp/\";\n"
-#~ " \n"
-#~ " // Location of the source list.\n"
-#~ " Etc \"/disc/\";\n"
-#~ " };"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid ""
-#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
-#~ " # apt-get update\n"
-#~ " [ APT fetches the package files ]\n"
-#~ " # apt-get dist-upgrade\n"
-#~ " [ APT fetches all the packages needed to upgrade the target machine ]"
-#~ msgstr ""
-#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
-#~ " # apt-get update\n"
-#~ " [ パッケージファイルを取得します ]\n"
-#~ " # apt-get dist-upgrade\n"
-#~ " [ アップグレードが必要な全パッケージを取得します ]"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid ""
-#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
-#~ " # apt-get check\n"
-#~ " [ APT generates a local copy of the cache files ]\n"
-#~ " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-"
-#~ "upgrade\n"
-#~ " [ Or any other APT command ]"
-#~ msgstr ""
-#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
-#~ " # apt-get update\n"
-#~ " [ パッケージファイルを取得します ]\n"
-#~ " # apt-get dist-upgrade\n"
-#~ " [ アップグレードが必要な全パッケージを取得します ]"
-
-# type: <title></title>
-#, fuzzy
-#~ msgid "Using APT and wget"
-#~ msgstr "オフラインでの APT の使用法"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Operation"
-#~ msgstr "オプション"
-
#~ msgid "<literal>Debug::Vendor</literal>"
#~ msgstr "<literal>Debug::Vendor</literal>"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 27b7a8a7b..7ee8cc964 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-11-27 00:18+0100\n"
"PO-Revision-Date: 2004-02-12 15:06+0100\n"
"Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ea410fc4d..331cb4d3f 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-11-27 00:18+0100\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"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 0f788aca1..e2993db2c 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -175,11 +175,11 @@ deb http://http.us.debian.org/debian dists/stable-updates/
commands to perform the file transfers from the remote.</para></listitem>
</varlistentry>
- <varlistentry><term>more recongnizable URI types</term>
+ <varlistentry><term>more recognizable URI types</term>
<listitem><para>
APT can be extended with more methods shipped in other optional packages which should
follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
- The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which
+ The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which
provides access methods for https-URIs with features similiar to the http method, but other
methods for using e.g. debtorrent are also available, see <citerefentry>
<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index d0dea7768..5b6b3940c 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -3,7 +3,7 @@
// $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $
/* ######################################################################
- apt-scanpackages - Efficient work-alike for dpkg-scanpackages
+ apt-ftparchive - Efficient work-alike for dpkg-scanpackages
Let contents be disabled from the conf
@@ -792,7 +792,7 @@ bool Generate(CommandLine &CmdL)
if (_config->FindB("APT::FTPArchive::Contents",true) == false)
return true;
- c1out << "Done Packages, Starting contents." << endl;
+ c1out << "Packages done, Starting contents." << endl;
// Sort the contents file list by date
string ArchiveDir = Setup.FindDir("Dir::ArchiveDir");
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index dfda827b6..e02f0e1b6 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string DB)
// apt 0.6.44
if (err == EINVAL)
{
- _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database."));
+ _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database."));
}
if (err)
{
@@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string DB)
return true;
}
/*}}}*/
-// CacheDB::OpenFile - Open the filei /*{{{*/
+// CacheDB::OpenFile - Open the file /*{{{*/
// ---------------------------------------------------------------------
/* */
bool CacheDB::OpenFile()
@@ -139,7 +139,7 @@ bool CacheDB::GetCurStat()
if (DBLoaded)
{
- /* First see if thre is anything about it
+ /* First see if there is anything about it
in the database */
/* Get the flags (and mtime) */
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 1f2cbcc3d..fb1438f74 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -13,7 +13,7 @@
removing the massive sort time overhead.
By breaking all the pathnames into components and storing them
- separately a space savings is realized by not duplicating the string
+ separately a space saving is realized by not duplicating the string
over and over again. Ultimately this saving is sacrificed to storage of
the tree structure itself but the tree structure yields a speed gain
in the sorting and processing. Ultimately it takes about 5 seconds to
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 2fc8efcbf..16cef9769 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -365,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc)
// MultiCompress::Child - The writer child /*{{{*/
// ---------------------------------------------------------------------
/* The child process forks a bunch of compression children and takes
- input on FD and passes it to all the compressor childer. On the way it
+ input on FD and passes it to all the compressor child. On the way it
computes the MD5 of the raw data. After this the raw data in the
original files is compared to see if this data is new. If the data
is new then the temp files are renamed, otherwise they are erased. */
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index b2ebdca8a..4e6c9a77d 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -463,7 +463,7 @@ bool PackagesWriter::DoPackage(string FileName)
SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str());
/* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that
- dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming
+ dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming
but dpkg does this append bit. So we do the append bit, at least that way the
status file and package file will remain similar. There are other transforms
but optional is the only legacy one still in use for some lazy reason. */
diff --git a/methods/connect.cc b/methods/connect.cc
index 74e670ebd..adb16a199 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -158,6 +158,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
struct addrinfo Hints;
memset(&Hints,0,sizeof(Hints));
Hints.ai_socktype = SOCK_STREAM;
+ Hints.ai_flags = AI_ADDRCONFIG;
Hints.ai_protocol = 0;
// if we couldn't resolve the host before, we don't try now
diff --git a/methods/http.cc b/methods/http.cc
index 3b210f6b6..2dae87a02 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -731,7 +731,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
}
- Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
+ Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
+ "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
if (Debug == true)
cerr << Req << endl;
diff --git a/methods/https.cc b/methods/https.cc
index 86d7f3a6b..5d8e63f47 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -1,4 +1,4 @@
-// -*- mode: cpp; mode: fold -*-
+//-*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
@@ -57,54 +57,41 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
return 0;
}
-void HttpsMethod::SetupProxy()
+void HttpsMethod::SetupProxy() /*{{{*/
{
URI ServerName = Queue->Uri;
- // Determine the proxy setting
- string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
- if (!SpecificProxy.empty())
- {
- if (SpecificProxy == "DIRECT")
- Proxy = "";
- else
- Proxy = SpecificProxy;
- }
- else
- {
- string DefProxy = _config->Find("Acquire::http::Proxy");
- if (!DefProxy.empty())
- {
- Proxy = DefProxy;
- }
- else
- {
- char* result = getenv("http_proxy");
- Proxy = result ? result : "";
- }
- }
-
- // Parse no_proxy, a , separated list of domains
- if (getenv("no_proxy") != 0)
+ // Determine the proxy setting - try https first, fallback to http and use env at last
+ string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
+ _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
+
+ if (UseProxy.empty() == true)
+ UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy").c_str());
+
+ // User want to use NO proxy, so nothing to setup
+ if (UseProxy == "DIRECT")
+ return;
+
+ if (UseProxy.empty() == false)
{
- if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
- Proxy = "";
+ // Parse no_proxy, a comma (,) separated list of domains we don't want to use
+ // a proxy for so we stop right here if it is in the list
+ if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+ return;
+ } else {
+ const char* result = getenv("http_proxy");
+ UseProxy = result == NULL ? "" : result;
}
-
+
// Determine what host and port to use based on the proxy settings
- string Host;
- if (Proxy.empty() == true || Proxy.Host.empty() == true)
- {
- }
- else
+ if (UseProxy.empty() == false)
{
- if (Proxy.Port != 0)
+ Proxy = UseProxy;
+ if (Proxy.Port != 1)
curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
}
-}
-
-
+} /*}}}*/
// HttpsMethod::Fetch - Fetch an item /*{{{*/
// ---------------------------------------------------------------------
/* This adds an item to the pipeline. We keep the pipeline at a fixed
@@ -191,12 +178,15 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version);
// cache-control
- if(_config->FindB("Acquire::http::No-Cache",false) == false)
+ if(_config->FindB("Acquire::https::No-Cache",
+ _config->FindB("Acquire::http::No-Cache",false)) == false)
{
// cache enabled
- if (_config->FindB("Acquire::http::No-Store",false) == true)
+ if (_config->FindB("Acquire::https::No-Store",
+ _config->FindB("Acquire::http::No-Store",false)) == true)
headers = curl_slist_append(headers,"Cache-Control: no-store");
- ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0));
+ ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::https::Max-Age",
+ _config->FindI("Acquire::http::Max-Age",0)));
headers = curl_slist_append(headers, ss.str().c_str());
} else {
// cache disabled by user
@@ -206,22 +196,28 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
// speed limit
- int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
+ int dlLimit = _config->FindI("Acquire::https::Dl-Limit",
+ _config->FindI("Acquire::http::Dl-Limit",0))*1024;
if (dlLimit > 0)
curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
// set header
- curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")");
+ curl_easy_setopt(curl, CURLOPT_USERAGENT,
+ _config->Find("Acquire::https::User-Agent",
+ _config->Find("Acquire::http::User-Agent",
+ "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
// set timeout
- int timeout = _config->FindI("Acquire::http::Timeout",120);
+ int timeout = _config->FindI("Acquire::https::Timeout",
+ _config->FindI("Acquire::http::Timeout",120));
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
//set really low lowspeed timeout (see #497983)
curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);
curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
// set redirect options and default to 10 redirects
- bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true);
+ bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
+ _config->FindB("Acquire::http::AllowRedirect",true));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);
diff --git a/methods/rred.cc b/methods/rred.cc
index 27d95bdde..262c78cab 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -1,202 +1,443 @@
+// Includes /*{{{*/
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/mmap.h>
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
#include <sys/stat.h>
+#include <sys/uio.h>
#include <unistd.h>
#include <utime.h>
#include <stdio.h>
#include <errno.h>
#include <apti18n.h>
-
-/* this method implements a patch functionality similar to "patch --ed" that is
- * used by the "tiffany" incremental packages download stuff. it differs from
- * "ed" insofar that it is way more restricted (and therefore secure). in the
- * moment only the "c", "a" and "d" commands of ed are implemented (diff
- * doesn't output any other). additionally the records must be reverse sorted
- * by line number and may not overlap (diff *seems* to produce this kind of
- * output).
+ /*}}}*/
+/** \brief RredMethod - ed-style incremential patch method {{{
+ *
+ * This method implements a patch functionality similar to "patch --ed" that is
+ * used by the "tiffany" incremental packages download stuff. It differs from
+ * "ed" insofar that it is way more restricted (and therefore secure).
+ * The currently supported ed commands are "<em>c</em>hange", "<em>a</em>dd" and
+ * "<em>d</em>elete" (diff doesn't output any other).
+ * Additionally the records must be reverse sorted by line number and
+ * may not overlap (diff *seems* to produce this kind of output).
* */
+class RredMethod : public pkgAcqMethod {
+ bool Debug;
+ // the size of this doesn't really matter (except for performance)
+ const static int BUF_SIZE = 1024;
+ // the supported ed commands
+ enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'};
+ // return values
+ enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED};
-const char *Prog;
+ State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file,
+ unsigned long &line, char *buffer, Hashes *hash) const;
+ void ignoreLineInFile(FILE *fin, char *buffer) const;
+ void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,
+ Hashes *hash, char *buffer) const;
-class RredMethod : public pkgAcqMethod
-{
- bool Debug;
- // the size of this doesn't really matter (except for performance)
- const static int BUF_SIZE = 1024;
- // the ed commands
- enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED};
- // return values
- enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE};
- // this applies a single hunk, it uses a tail recursion to
- // reverse the hunks in the file
- int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line,
- char *buffer, unsigned int bufsize, Hashes *hash);
- // apply a patch file
- int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash);
- // the methods main method
- virtual bool Fetch(FetchItem *Itm);
-
- public:
-
- RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
+ State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
+ State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
+
+protected:
+ // the methods main method
+ virtual bool Fetch(FetchItem *Itm);
+
+public:
+ RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
};
+ /*}}}*/
+/** \brief applyFile - in reverse order with a tail recursion {{{
+ *
+ * As it is expected that the commands are in reversed order in the patch file
+ * we check in the first half if the command is valid, but doesn't execute it
+ * and move a step deeper. After reaching the end of the file we apply the
+ * patches in the correct order: last found command first.
+ *
+ * \param ed_cmds patch file to apply
+ * \param in_file base file we want to patch
+ * \param out_file file to write the patched result to
+ * \param line of command operation
+ * \param buffer internal used read/write buffer
+ * \param hash the created file for correctness
+ * \return the success State of the ed command executor
+ */
+RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file,
+ unsigned long &line, char *buffer, Hashes *hash) const {
+ // get the current command and parse it
+ if (fgets(buffer, BUF_SIZE, ed_cmds) == NULL) {
+ if (Debug == true)
+ std::clog << "rred: encounter end of file - we can start patching now." << std::endl;
+ line = 0;
+ return ED_OK;
+ }
-int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line,
- char *buffer, unsigned int bufsize, Hashes *hash) {
- int pos;
- int startline;
- int stopline;
- int mode;
- int written;
- char *idx;
-
- /* get the current command and parse it*/
- if (fgets(buffer, bufsize, ed_cmds) == NULL) {
- return line;
- }
- startline = strtol(buffer, &idx, 10);
- if (startline < line) {
- return ED_ORDERING;
- }
- if (*idx == ',') {
- idx++;
- stopline = strtol(idx, &idx, 10);
- }
- else {
- stopline = startline;
- }
- if (*idx == 'c') {
- mode = MODE_CHANGED;
- if (Debug == true) {
- std::clog << "changing from line " << startline
- << " to " << stopline << std::endl;
- }
- }
- else if (*idx == 'a') {
- mode = MODE_ADDED;
- if (Debug == true) {
- std::clog << "adding after line " << startline << std::endl;
- }
- }
- else if (*idx == 'd') {
- mode = MODE_DELETED;
- if (Debug == true) {
- std::clog << "deleting from line " << startline
- << " to " << stopline << std::endl;
- }
- }
- else {
- return ED_PARSER;
- }
- /* get the current position */
- pos = ftell(ed_cmds);
- /* if this is add or change then go to the next full stop */
- if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) {
- do {
- fgets(buffer, bufsize, ed_cmds);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, ed_cmds);
- buffer[0] = ' ';
- }
- } while (strncmp(buffer, ".", 1) != 0);
- }
- /* do the recursive call */
- line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize,
- hash);
- /* pass on errors */
- if (line < 0) {
- return line;
- }
- /* apply our hunk */
- fseek(ed_cmds, pos, SEEK_SET);
- /* first wind to the current position */
- if (mode != MODE_ADDED) {
- startline -= 1;
- }
- while (line < startline) {
- fgets(buffer, bufsize, in_file);
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, in_file);
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- }
- line++;
- }
- /* include from ed script */
- if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) {
- do {
- fgets(buffer, bufsize, ed_cmds);
- if (strncmp(buffer, ".", 1) != 0) {
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, ed_cmds);
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- }
- }
- else {
- break;
- }
- } while (1);
- }
- /* ignore the corresponding number of lines from input */
- if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) {
- while (line < stopline) {
- fgets(buffer, bufsize, in_file);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, in_file);
- }
- line++;
- }
- }
- return line;
-}
+ // parse in the effected linenumbers
+ char* idx;
+ errno=0;
+ unsigned long const startline = strtol(buffer, &idx, 10);
+ if (errno == ERANGE || errno == EINVAL) {
+ _error->Errno("rred", "startline is an invalid number");
+ return ED_PARSER;
+ }
+ if (startline > line) {
+ _error->Error("rred: The start line (%lu) of the next command is higher than the last line (%lu). This is not allowed.", startline, line);
+ return ED_ORDERING;
+ }
+ unsigned long stopline;
+ if (*idx == ',') {
+ idx++;
+ errno=0;
+ stopline = strtol(idx, &idx, 10);
+ if (errno == ERANGE || errno == EINVAL) {
+ _error->Errno("rred", "stopline is an invalid number");
+ return ED_PARSER;
+ }
+ }
+ else {
+ stopline = startline;
+ }
+ line = startline;
+
+ // which command to execute on this line(s)?
+ switch (*idx) {
+ case MODE_CHANGED:
+ if (Debug == true)
+ std::clog << "Change from line " << startline << " to " << stopline << std::endl;
+ break;
+ case MODE_ADDED:
+ if (Debug == true)
+ std::clog << "Insert after line " << startline << std::endl;
+ break;
+ case MODE_DELETED:
+ if (Debug == true)
+ std::clog << "Delete from line " << startline << " to " << stopline << std::endl;
+ break;
+ default:
+ _error->Error("rred: Unknown ed command '%c'. Abort.", *idx);
+ return ED_PARSER;
+ }
+ unsigned char mode = *idx;
+
+ // save the current position
+ unsigned const long pos = ftell(ed_cmds);
+
+ // if this is add or change then go to the next full stop
+ unsigned int data_length = 0;
+ if (mode == MODE_CHANGED || mode == MODE_ADDED) {
+ do {
+ ignoreLineInFile(ed_cmds, buffer);
+ data_length++;
+ }
+ while (strncmp(buffer, ".", 1) != 0);
+ data_length--; // the dot should not be copied
+ }
+
+ // do the recursive call - the last command is the one we need to execute at first
+ const State child = applyFile(ed_cmds, in_file, out_file, line, buffer, hash);
+ if (child != ED_OK) {
+ return child;
+ }
+
+ // change and delete are working on "line" - add is done after "line"
+ if (mode != MODE_ADDED)
+ line++;
+
+ // first wind to the current position and copy over all unchanged lines
+ if (line < startline) {
+ copyLinesFromFileToFile(in_file, out_file, (startline - line), hash, buffer);
+ line = startline;
+ }
-int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file,
- Hashes *hash) {
+ if (mode != MODE_ADDED)
+ line--;
+
+ // include data from ed script
+ if (mode == MODE_CHANGED || mode == MODE_ADDED) {
+ fseek(ed_cmds, pos, SEEK_SET);
+ copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer);
+ }
+
+ // ignore the corresponding number of lines from input
+ if (mode == MODE_CHANGED || mode == MODE_DELETED) {
+ while (line < stopline) {
+ ignoreLineInFile(in_file, buffer);
+ line++;
+ }
+ }
+ return ED_OK;
+}
+ /*}}}*/
+void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,/*{{{*/
+ Hashes *hash, char *buffer) const {
+ while (0 < lines--) {
+ do {
+ fgets(buffer, BUF_SIZE, fin);
+ size_t const written = fwrite(buffer, 1, strlen(buffer), fout);
+ hash->Add((unsigned char*)buffer, written);
+ } while (strlen(buffer) == (BUF_SIZE - 1) &&
+ buffer[BUF_SIZE - 2] != '\n');
+ }
+}
+ /*}}}*/
+void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/
+ fgets(buffer, BUF_SIZE, fin);
+ while (strlen(buffer) == (BUF_SIZE - 1) &&
+ buffer[BUF_SIZE - 2] != '\n') {
+ fgets(buffer, BUF_SIZE, fin);
+ buffer[0] = ' ';
+ }
+}
+ /*}}}*/
+RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/
+ FileFd &out_file, Hashes *hash) const {
char buffer[BUF_SIZE];
- int result;
- int written;
-
+ FILE* fFrom = fdopen(From.Fd(), "r");
+ FILE* fPatch = fdopen(Patch.Fd(), "r");
+ FILE* fTo = fdopen(out_file.Fd(), "w");
+
/* we do a tail recursion to read the commands in the right order */
- result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE,
- hash);
+ unsigned long line = -1; // assign highest possible value
+ State const result = applyFile(fPatch, fFrom, fTo, line, buffer, hash);
/* read the rest from infile */
- if (result >= 0) {
- while (fgets(buffer, BUF_SIZE, in_file) != NULL) {
- written = fwrite(buffer, 1, strlen(buffer), out_file);
+ if (result == ED_OK) {
+ while (fgets(buffer, BUF_SIZE, fFrom) != NULL) {
+ size_t const written = fwrite(buffer, 1, strlen(buffer), fTo);
hash->Add((unsigned char*)buffer, written);
}
+ fflush(fTo);
}
- else {
- return ED_FAILURE;
- }
- return ED_OK;
+ return result;
}
+ /*}}}*/
+struct EdCommand { /*{{{*/
+ size_t data_start;
+ size_t data_end;
+ size_t data_lines;
+ size_t first_line;
+ size_t last_line;
+ char type;
+};
+#define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */
+ /*}}}*/
+RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/
+ FileFd &out_file, Hashes *hash) const {
+#ifdef _POSIX_MAPPED_FILES
+ MMap ed_cmds(Patch, MMap::ReadOnly);
+ MMap in_file(From, MMap::ReadOnly);
+
+ if (ed_cmds.Size() == 0 || in_file.Size() == 0)
+ return MMAP_FAILED;
+
+ EdCommand* commands = 0;
+ size_t command_count = 0;
+ size_t command_alloc = 0;
+
+ const char* begin = (char*) ed_cmds.Data();
+ const char* end = begin;
+ const char* ed_end = (char*) ed_cmds.Data() + ed_cmds.Size();
+
+ const char* input = (char*) in_file.Data();
+ const char* input_end = (char*) in_file.Data() + in_file.Size();
+
+ size_t i;
+
+ /* 1. Parse entire script. It is executed in reverse order, so we cather it
+ * in the `commands' buffer first
+ */
+
+ for(;;) {
+ EdCommand cmd;
+ cmd.data_start = 0;
+ cmd.data_end = 0;
+
+ while(begin != ed_end && *begin == '\n')
+ ++begin;
+ while(end != ed_end && *end != '\n')
+ ++end;
+ if(end == ed_end && begin == end)
+ break;
+
+ /* Determine command range */
+ const char* tmp = begin;
+
+ for(;;) {
+ /* atoll is safe despite lacking NUL-termination; we know there's an
+ * alphabetic character at end[-1]
+ */
+ if(tmp == end) {
+ cmd.first_line = atol(begin);
+ cmd.last_line = cmd.first_line;
+ break;
+ }
+ if(*tmp == ',') {
+ cmd.first_line = atol(begin);
+ cmd.last_line = atol(tmp + 1);
+ break;
+ }
+ ++tmp;
+ }
+
+ // which command to execute on this line(s)?
+ switch (end[-1]) {
+ case MODE_CHANGED:
+ if (Debug == true)
+ std::clog << "Change from line " << cmd.first_line << " to " << cmd.last_line << std::endl;
+ break;
+ case MODE_ADDED:
+ if (Debug == true)
+ std::clog << "Insert after line " << cmd.first_line << std::endl;
+ break;
+ case MODE_DELETED:
+ if (Debug == true)
+ std::clog << "Delete from line " << cmd.first_line << " to " << cmd.last_line << std::endl;
+ break;
+ default:
+ _error->Error("rred: Unknown ed command '%c'. Abort.", end[-1]);
+ free(commands);
+ return ED_PARSER;
+ }
+ cmd.type = end[-1];
+
+ /* Determine the size of the inserted text, so we don't have to scan this
+ * text again later.
+ */
+ begin = end + 1;
+ end = begin;
+ cmd.data_lines = 0;
+
+ if(cmd.type == MODE_ADDED || cmd.type == MODE_CHANGED) {
+ cmd.data_start = begin - (char*) ed_cmds.Data();
+ while(end != ed_end) {
+ if(*end == '\n') {
+ if(end[-1] == '.' && end[-2] == '\n')
+ break;
+ ++cmd.data_lines;
+ }
+ ++end;
+ }
+ cmd.data_end = end - (char*) ed_cmds.Data() - 1;
+ begin = end + 1;
+ end = begin;
+ }
+ if(command_count == command_alloc) {
+ command_alloc = (command_alloc + 64) * 3 / 2;
+ commands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand));
+ }
+ commands[command_count++] = cmd;
+ }
+
+ struct iovec* iov = new struct iovec[IOV_COUNT];
+ size_t iov_size = 0;
+
+ size_t amount, remaining;
+ size_t line = 1;
+ EdCommand* cmd;
+
+ /* 2. Execute script. We gather writes in a `struct iov' array, and flush
+ * using writev to minimize the number of system calls. Data is read
+ * directly from the memory mappings of the input file and the script.
+ */
+
+ for(i = command_count; i-- > 0; ) {
+ cmd = &commands[i];
+ if(cmd->type == MODE_ADDED)
+ amount = cmd->first_line + 1;
+ else
+ amount = cmd->first_line;
+
+ if(line < amount) {
+ begin = input;
+ while(line != amount) {
+ input = (const char*) memchr(input, '\n', input_end - input);
+ if(!input)
+ break;
+ ++line;
+ ++input;
+ }
+ iov[iov_size].iov_base = (void*) begin;
+ iov[iov_size].iov_len = input - begin;
+ hash->Add((const unsigned char*) begin, input - begin);
-bool RredMethod::Fetch(FetchItem *Itm)
+ if(++iov_size == IOV_COUNT) {
+ writev(out_file.Fd(), iov, IOV_COUNT);
+ iov_size = 0;
+ }
+ }
+
+ if(cmd->type == MODE_DELETED || cmd->type == MODE_CHANGED) {
+ remaining = (cmd->last_line - cmd->first_line) + 1;
+ line += remaining;
+ while(remaining) {
+ input = (const char*) memchr(input, '\n', input_end - input);
+ if(!input)
+ break;
+ --remaining;
+ ++input;
+ }
+ }
+
+ if(cmd->type == MODE_CHANGED || cmd->type == MODE_ADDED) {
+ if(cmd->data_end != cmd->data_start) {
+ iov[iov_size].iov_base = (void*) ((char*)ed_cmds.Data() + cmd->data_start);
+ iov[iov_size].iov_len = cmd->data_end - cmd->data_start;
+ hash->Add((const unsigned char*) ((char*)ed_cmds.Data() + cmd->data_start),
+ iov[iov_size].iov_len);
+
+ if(++iov_size == IOV_COUNT) {
+ writev(out_file.Fd(), iov, IOV_COUNT);
+ iov_size = 0;
+ }
+ }
+ }
+ }
+
+ if(input != input_end) {
+ iov[iov_size].iov_base = (void*) input;
+ iov[iov_size].iov_len = input_end - input;
+ hash->Add((const unsigned char*) input, input_end - input);
+ ++iov_size;
+ }
+
+ if(iov_size) {
+ writev(out_file.Fd(), iov, iov_size);
+ iov_size = 0;
+ }
+
+ for(i = 0; i < iov_size; i += IOV_COUNT) {
+ if(iov_size - i < IOV_COUNT)
+ writev(out_file.Fd(), iov + i, iov_size - i);
+ else
+ writev(out_file.Fd(), iov + i, IOV_COUNT);
+ }
+
+ delete [] iov;
+ free(commands);
+
+ return ED_OK;
+#else
+ return MMAP_FAILED;
+#endif
+}
+ /*}}}*/
+bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/
{
- Debug = _config->FindB("Debug::pkgAcquire::RRed",false);
+ Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
URI Get = Itm->Uri;
string Path = Get.Host + Get.Path; // To account for relative paths
- // Path contains the filename to patch
+
FetchResult Res;
Res.Filename = Itm->DestFile;
- URIStart(Res);
- // Res.Filename the destination filename
+ if (Itm->Uri.empty() == true) {
+ Path = Itm->DestFile;
+ Itm->DestFile.append(".result");
+ } else
+ URIStart(Res);
if (Debug == true)
std::clog << "Patching " << Path << " with " << Path
@@ -211,19 +452,27 @@ bool RredMethod::Fetch(FetchItem *Itm)
return false;
Hashes Hash;
- FILE* fFrom = fdopen(From.Fd(), "r");
- FILE* fPatch = fdopen(Patch.Fd(), "r");
- FILE* fTo = fdopen(To.Fd(), "w");
// now do the actual patching
- if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) {
- _error->Errno("rred", _("Could not patch file"));
- return false;
+ State const result = patchMMap(Patch, From, To, &Hash);
+ if (result == MMAP_FAILED) {
+ // retry with patchFile
+ lseek(Patch.Fd(), 0, SEEK_SET);
+ lseek(From.Fd(), 0, SEEK_SET);
+ To.Open(Itm->DestFile,FileFd::WriteEmpty);
+ if (_error->PendingError() == true)
+ return false;
+ if (patchFile(Patch, From, To, &Hash) != ED_OK) {
+ return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str());
+ } else if (Debug == true) {
+ std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl;
+ }
+ } else if (result != ED_OK) {
+ return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str());
+ } else if (Debug == true) {
+ std::clog << "rred: finished mmap patching of " << Path << std::endl;
}
// write out the result
- fflush(fFrom);
- fflush(fPatch);
- fflush(fTo);
From.Close();
Patch.Close();
To.Close();
@@ -250,13 +499,44 @@ bool RredMethod::Fetch(FetchItem *Itm)
return true;
}
-
-int main(int argc, char *argv[])
-{
- RredMethod Mth;
-
- Prog = strrchr(argv[0],'/');
- Prog++;
-
- return Mth.Run();
+ /*}}}*/
+/** \brief Wrapper class for testing rred */ /*{{{*/
+class TestRredMethod : public RredMethod {
+public:
+ /** \brief Run rred in debug test mode
+ *
+ * This method can be used to run the rred method outside
+ * of the "normal" acquire environment for easier testing.
+ *
+ * \param base basename of all files involved in this rred test
+ */
+ bool Run(char const *base) {
+ _config->CndSet("Debug::pkgAcquire::RRed", "true");
+ FetchItem *test = new FetchItem;
+ test->DestFile = base;
+ return Fetch(test);
+ }
+};
+ /*}}}*/
+/** \brief Starter for the rred method (or its test method) {{{
+ *
+ * Used without parameters is the normal behavior for methods for
+ * the APT acquire system. While this works great for the acquire system
+ * it is very hard to test the method and therefore the method also
+ * accepts one parameter which will switch it directly to debug test mode:
+ * The test mode expects that if "Testfile" is given as parameter
+ * the file "Testfile" should be ed-style patched with "Testfile.ed"
+ * and will write the result to "Testfile.result".
+ */
+int main(int argc, char *argv[]) {
+ if (argc <= 1) {
+ RredMethod Mth;
+ return Mth.Run();
+ } else {
+ TestRredMethod Mth;
+ bool result = Mth.Run(argv[1]);
+ _error->DumpErrors();
+ return result;
+ }
}
+ /*}}}*/
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 83c55c9d4..ac231dff9 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-10 16:49+0100\n"
+"POT-Creation-Date: 2009-12-10 22:06+0100\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"
@@ -151,7 +151,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -426,26 +426,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -549,7 +549,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -692,7 +692,7 @@ msgstr ""
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
msgid "There are problems and -y was used without --force-yes"
msgstr ""
@@ -708,11 +708,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -741,25 +741,26 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -767,74 +768,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -842,73 +843,84 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1313
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1342
#, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1515
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -924,49 +936,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -974,152 +986,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1163,7 +1175,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1764,7 +1776,7 @@ msgstr ""
#: methods/connect.cc:193
#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
#: methods/connect.cc:240
@@ -2297,7 +2309,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:439
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2305,6 +2324,13 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
+#: apt-pkg/packagemanager.cc:478
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:33:56 +0000