summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/fileutl.cc19
-rw-r--r--debian/changelog18
-rw-r--r--doc/apt-cache.8.xml14
-rw-r--r--doc/apt-cdrom.8.xml9
-rw-r--r--doc/apt-config.8.xml6
-rw-r--r--doc/apt-extracttemplates.1.xml4
-rw-r--r--doc/apt-ftparchive.1.xml18
-rw-r--r--doc/apt-get.8.xml6
-rw-r--r--doc/apt-key.8.xml4
-rw-r--r--doc/apt-mark.8.xml13
-rw-r--r--doc/apt-secure.8.xml4
-rw-r--r--doc/apt-sortpkgs.1.xml4
-rw-r--r--doc/apt-verbatim.ent12
-rw-r--r--doc/apt.82
-rw-r--r--doc/apt.conf.5.xml4
-rw-r--r--doc/apt.ent4
-rw-r--r--doc/apt_preferences.5.xml6
-rw-r--r--doc/design.sgml2
-rw-r--r--doc/dpkg-tech.sgml2
-rw-r--r--doc/files.sgml2
-rw-r--r--doc/guide.sgml2
-rw-r--r--doc/makefile4
-rw-r--r--doc/method.sgml2
-rw-r--r--doc/offline.sgml2
-rw-r--r--doc/po/apt-doc.pot435
-rw-r--r--doc/po/de.po524
-rw-r--r--doc/po/es.po798
-rw-r--r--doc/po/fr.po820
-rw-r--r--doc/po/it.po418
-rw-r--r--doc/po/ja.po864
-rw-r--r--doc/po/pl.po806
-rw-r--r--doc/po/pt.po819
-rw-r--r--doc/po/pt_BR.po505
-rw-r--r--doc/po4a.conf9
-rw-r--r--doc/sources.list.5.xml31
35 files changed, 2248 insertions, 3944 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index c7f78cdfb..119cd1974 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1024,7 +1024,20 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
{
Close();
Flags = (AutoClose) ? FileFd::AutoClose : 0;
- iFd = Fd;
+ if (AutoClose == false && (
+#ifdef HAVE_ZLIB
+ compressor.Name == "gzip" ||
+#endif
+#ifdef HAVE_BZ2
+ compressor.Name == "bzip2" ||
+#endif
+ false))
+ {
+ // Need to duplicate fd here or gzclose for cleanup will close the fd as well
+ iFd = dup(Fd);
+ }
+ else
+ iFd = Fd;
this->FileName = "";
if (OpenInternDescriptor(Mode, compressor) == false)
{
@@ -1183,8 +1196,6 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
close(Pipe[0]);
else
close(Pipe[1]);
- if ((Comp == true || FileName.empty() == true) && d->compressed_fd != -1)
- close(d->compressed_fd);
return true;
}
@@ -1712,7 +1723,7 @@ bool FileFd::Close()
}
}
- if ((Flags & Replace) == Replace && iFd >= 0) {
+ if ((Flags & Replace) == Replace) {
if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0)
Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str());
diff --git a/debian/changelog b/debian/changelog
index 661610f79..4edc80ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+apt (0.9.6) UNRELEASED; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/fileutl.cc:
+ - dup() given compressed fd in OpenDescriptor if AutoClose
+ is disabled as otherwise gzclose() and co will close it
+ * doc/*.xml:
+ - mark even more stuff as untranslateable and improve the
+ markup here and there (no real text change)
+ - use docbook DTD 4.5 instead of 4.2 to have valid docs
+
+ [ Justin B Rye ]
+ * doc/*.xml:
+ - remove 'GNU/Linux' from 'Debian systems' strings as Debian
+ has more systems than just GNU/Linux nowadays
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 May 2012 18:13:19 +0200
+
apt (0.9.5ubuntu1) UNRELEASED; urgency=low
* merged from debian, remaining changes:
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index f36347107..cf6303268 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -100,20 +100,20 @@ Reverse Provides:
<listitem><para><literal>Pure virtual packages</literal> is the number of packages that exist
only as a virtual package name; that is, packages only "provide" the
virtual package name, and no package actually uses the name. For
- instance, "mail-transport-agent" in the Debian GNU/Linux system is a
+ instance, "mail-transport-agent" in the Debian system is a
pure virtual package; several packages provide "mail-transport-agent",
but there is no package named "mail-transport-agent".</para>
</listitem>
<listitem><para><literal>Single virtual packages</literal> is the number of packages with only
one package providing a particular virtual package. For example, in the
- Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but
+ Debian system, "X11-text-viewer" is a virtual package, but
only one package, xless, provides "X11-text-viewer".</para>
</listitem>
<listitem><para><literal>Mixed virtual packages</literal> is the number of packages that either
provide a particular virtual package or have the virtual package name
- as the package name. For instance, in the Debian GNU/Linux system,
+ as the package name. For instance, in the Debian system,
"debconf" is both an actual package, and provided by the debconf-tiny
package.</para>
</listitem>
@@ -168,9 +168,7 @@ Reverse Provides:
<varlistentry><term><option>search</option> <option><replaceable>&synopsis-regex;</replaceable>…</option></term>
<listitem><para><literal>search</literal> performs a full text search on all available package
- lists for the POSIX regex pattern given, see
- <citerefentry><refentrytitle><command>regex</command></refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>.
+ lists for the POSIX regex pattern given, see &regex;.
It searches the package names and the
descriptions for an occurrence of the regular expression and prints out
the package name and the short description, including virtual package
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 501c4ee7e..1dd552496 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -49,8 +49,8 @@
</para>
<para>Unless the <option>-h</option>, or <option>--help</option> option is
- given one of the commands below must be present.
-
+ given, one of the commands below must be present.</para>
+
<variablelist>
<varlistentry><term><option>add</option></term>
<listitem><para><literal>add</literal> is used to add a new disc to the
@@ -75,7 +75,6 @@
</listitem>
</varlistentry>
</variablelist>
- </para>
</refsect1>
<refsect1><title>Options</title>
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index a8fb897ef..a7164b4e7 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -42,7 +42,7 @@
manner that is easy to use by scripted applications.</para>
<para>Unless the <option>-h</option>, or <option>--help</option> option is
- given one of the commands below must be present.
+ given, one of the commands below must be present.
</para>
<variablelist>
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 3c1621cad..7d0f0bfea 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 028d9f70e..84b5f4135 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -51,8 +51,8 @@
programs aside from &gzip;. When doing a full generate it automatically
performs file-change checks and builds the desired compressed output files.</para>
- <para>Unless the <option>-h</option>, or <option>--help</option> option is given one of the
- commands below must be present.</para>
+ <para>Unless the <option>-h</option>, or <option>--help</option> option is given,
+ one of the commands below must be present.</para>
<variablelist>
<varlistentry><term><option>packages</option></term>
@@ -141,7 +141,7 @@
<para>
The generate configuration has 4 separate sections, each described below.</para>
- <refsect2><title>Dir Section</title>
+ <refsect2><title><literal>Dir</literal> Section</title>
<para>
The <literal>Dir</literal> section defines the standard directories needed to
locate the files required during the generation process. These
@@ -173,7 +173,7 @@
</variablelist>
</refsect2>
- <refsect2><title>Default Section</title>
+ <refsect2><title><literal>Default</literal> Section</title>
<para>
The <literal>Default</literal> section specifies default values, and settings
that control the operation of the generator. Other sections may override
@@ -239,7 +239,7 @@
</variablelist>
</refsect2>
- <refsect2><title>TreeDefault Section</title>
+ <refsect2><title><literal>TreeDefault</literal> Section</title>
<para>
Sets defaults specific to <literal>Tree</literal> sections. All of these
variables are substitution variables and have the strings $(DIST),
@@ -339,7 +339,7 @@
</variablelist>
</refsect2>
- <refsect2><title>Tree Section</title>
+ <refsect2><title><literal>Tree</literal> Section</title>
<para>
The <literal>Tree</literal> section defines a standard Debian file tree which
consists of a base directory, then multiple sections in that base
@@ -407,7 +407,7 @@ for i in Sections do
</variablelist>
</refsect2>
- <refsect2><title>BinDirectory Section</title>
+ <refsect2><title><literal>BinDirectory</literal> Section</title>
<para>
The <literal>bindirectory</literal> section defines a binary directory tree
with no special structure. The scope tag specifies the location of
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index e4c72188a..620d22106 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -98,7 +98,7 @@
<para><literal>install</literal> is followed by one or more
packages desired for installation or upgrading.
Each package is a package name, not a fully qualified
- filename (for instance, in a Debian GNU/Linux system,
+ filename (for instance, in a Debian system,
libc6 would be the argument provided, not
<literal>libc6_1.9.6-2.deb</literal>). All packages required
by the package(s) specified for installation will also
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 3ff53b1cd..fcbc35aae 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 3b2b43c24..8f289c49a 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -109,12 +109,11 @@
<variablelist>
<varlistentry>
- <term><option>-f=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
- <term><option>--file=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
+ <term><option>-f=&synopsis-param-filename;</option></term>
+ <term><option>--file=&synopsis-param-filename;</option></term>
<listitem><para>
Read/Write package stats from the filename given with the parameter
- <filename><replaceable>&synopsis-filename;</replaceable></filename>
- instead of from the default location, which
+ &synopsis-param-filename; instead of from the default location, which
is <filename>extended_status</filename> in the directory defined
by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
</varlistentry>
@@ -130,7 +129,7 @@
</refsect1>
<refsect1><title>See Also</title>
- <para>&apt-get;,&aptitude;,&apt-conf;</para>
+ <para><phrase>&apt-get;,&aptitude;,&apt-conf;</phrase></para>
</refsect1>
<refsect1><title>Diagnostics</title>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 7a3b51fa9..e83d76859 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml
index 11b26cdad..f4b2a64a4 100644
--- a/doc/apt-sortpkgs.1.xml
+++ b/doc/apt-sortpkgs.1.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a44f37ab8..ff37f4ae7 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -154,6 +154,18 @@
</citerefentry>"
>
+<!ENTITY apt-transport-debtorrent "<citerefentry>
+ <refentrytitle><package>apt-transport-debtorrent</package></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY regex "<citerefentry>
+ <refentrytitle><abbrev>regex</abbrev></refentrytitle>
+ <manvolnum>7</manvolnum>
+ </citerefentry>"
+>
+
<!-- Boiler plate docinfo section -->
<!ENTITY apt-email "
<address>
diff --git a/doc/apt.8 b/doc/apt.8
index e7ca8c44b..d84a3b4dd 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -14,7 +14,7 @@
.\" License along with APT; if not, write to the Free Software
.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH apt 8 "16 June 1998" "Debian GNU/Linux"
+.TH apt 8 "16 June 1998" "Debian"
.SH NAME
apt \- Advanced Package Tool
.SH SYNOPSIS
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 3de22e098..bb538c660 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
diff --git a/doc/apt.ent b/doc/apt.ent
index ea1dc0265..6a3837b95 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -103,7 +103,7 @@
<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
<listitem><para>Storage area for package files in transit.
- Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>
+ Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
</varlistentry>
">
@@ -144,7 +144,7 @@
<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
<listitem><para>Storage area for state information in transit.
- Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>
+ Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
</varlistentry>
">
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 7df7b0ed7..1f953029e 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -460,7 +460,7 @@ Pin: release n=&testing-codename;
<varlistentry>
<term>the <literal>Version:</literal> line</term>
<listitem><simpara>names the release version. For example, the
-packages in the tree might belong to Debian GNU/Linux release
+packages in the tree might belong to Debian release
version 3.0. Note that there is normally no version number for the
<literal>testing</literal> and <literal>unstable</literal> distributions because they
have not been released yet. Specifying this in the APT preferences
diff --git a/doc/design.sgml b/doc/design.sgml
index 0fd708162..1ddf49fd8 100644
--- a/doc/design.sgml
+++ b/doc/design.sgml
@@ -31,7 +31,7 @@
<p>
You should have received a copy of the GNU General Public
- License with your Debian GNU/Linux system, in
+ License with your Debian system, in
<tt>/usr/share/common-licenses/GPL</tt>, or with the
<prgn/debiandoc-sgml/ source package as the file
<tt>COPYING</tt>. If not, write to the Free Software
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 7c6e023dd..d377a35dc 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -21,7 +21,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/files.sgml b/doc/files.sgml
index 2d0ae4a44..974b73fb0 100644
--- a/doc/files.sgml
+++ b/doc/files.sgml
@@ -21,7 +21,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/guide.sgml b/doc/guide.sgml
index ff727f6ca..8d762b6f3 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -19,7 +19,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/makefile b/doc/makefile
index d9542b438..7b49ac269 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -84,12 +84,12 @@ doc: po4a
update-po:
po4a --previous --no-backups --force --no-translations \
- --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
+ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
po4a:
po4a --previous --no-backups \
- --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
+ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
endif
diff --git a/doc/method.sgml b/doc/method.sgml
index d71ef02ea..3bee47d3a 100644
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -20,7 +20,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/offline.sgml b/doc/offline.sgml
index e7ede14de..659ca3147 100644
--- a/doc/offline.sgml
+++ b/doc/offline.sgml
@@ -20,7 +20,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index bd4e80d1a..688ef1e19 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the apt package.
+# This file is distributed under the same license as the apt-doc package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.9.5\n"
+"Project-Id-Version: apt-doc 0.9.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:30+0300\n"
+"POT-Creation-Date: 2012-05-24 15:04+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
+msgid "Debian"
msgstr ""
#. type: SH
@@ -309,7 +309,7 @@ msgid ""
" <listitem><para>Storage area for package files in transit.\n"
" Configuration Item: <literal>Dir::Cache::Archives</literal> "
"(<filename>partial</filename> will be implicitly "
-"appended). </para></listitem>\n"
+"appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -391,7 +391,7 @@ msgid ""
" <listitem><para>Storage area for state information in transit.\n"
" Configuration Item: <literal>Dir::State::Lists</literal> "
"(<filename>partial</filename> will be implicitly "
-"appended).</para></listitem>\n"
+"appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -635,7 +635,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44 apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -649,7 +649,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208 apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206 apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -724,9 +724,9 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
-"package; several packages provide \"mail-transport-agent\", but there is no "
-"package named \"mail-transport-agent\"."
+"\"mail-transport-agent\" in the Debian system is a pure virtual package; "
+"several packages provide \"mail-transport-agent\", but there is no package "
+"named \"mail-transport-agent\"."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -734,8 +734,8 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
-"one package, xless, provides \"X11-text-viewer\"."
+"Debian system, \"X11-text-viewer\" is a virtual package, but only one "
+"package, xless, provides \"X11-text-viewer\"."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -743,9 +743,8 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, "
-"\"debconf\" is both an actual package, and provided by the debconf-tiny "
-"package."
+"as the package name. For instance, in the Debian system, \"debconf\" is both "
+"an actual package, and provided by the debconf-tiny package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -821,45 +820,43 @@ msgstr ""
#: apt-cache.8.xml:170
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -869,7 +866,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -877,7 +874,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink "
@@ -890,7 +887,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -899,12 +896,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -912,12 +909,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -926,7 +923,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -938,12 +935,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: "
@@ -951,7 +948,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -961,7 +958,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -970,7 +967,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -978,7 +975,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -988,14 +985,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If "
@@ -1006,7 +1003,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use "
@@ -1015,14 +1012,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: "
@@ -1030,7 +1027,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1038,45 +1035,35 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and "
"<literal>rdepends</literal> to packages which are currently installed. "
"Configuration Item: <literal>APT::Cache::Installed</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126 apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:255
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1104,7 +1091,7 @@ msgid ""
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1114,7 +1101,7 @@ msgid ""
"title."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1122,28 +1109,20 @@ msgid ""
"<filename>&statedir;/cdroms.list</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder "
-"type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1151,7 +1130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -1159,7 +1138,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: "
@@ -1167,7 +1146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1176,7 +1155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1184,7 +1163,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1192,12 +1171,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1217,13 +1196,6 @@ msgid ""
"manner that is easy to use by scripted applications."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -1495,7 +1467,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
+msgid "<literal>Dir</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1534,7 +1506,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
+msgid "<literal>Default</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1613,7 +1585,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
+msgid "<literal>TreeDefault</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1728,7 +1700,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
+msgid "<literal>Tree</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1818,7 +1790,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2037,7 +2009,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:214
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
msgid "Examples"
msgstr ""
@@ -2139,15 +2111,15 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
-"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
-"packages required by the package(s) specified for installation will also be "
-"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
-"file is used to locate the desired packages. If a hyphen is appended to the "
-"package name (with no intervening space), the identified package will be "
-"removed if it is installed. Similarly a plus sign can be used to designate "
-"a package to install. These latter features may be used to override "
-"decisions made by apt-get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, libc6 would be the "
+"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"required by the package(s) specified for installation will also be retrieved "
+"and installed. The <filename>/etc/apt/sources.list</filename> file is used "
+"to locate the desired packages. If a hyphen is appended to the package name "
+"(with no intervening space), the identified package will be removed if it is "
+"installed. Similarly a plus sign can be used to designate a package to "
+"install. These latter features may be used to override decisions made by "
+"apt-get's conflict resolution system."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2643,13 +2615,6 @@ msgid ""
"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:530
msgid ""
@@ -2762,11 +2727,6 @@ msgid ""
"e.g. new keys are added to this one."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -2881,33 +2841,17 @@ msgid ""
"the same way as for the other show commands."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: "
-"<literal>Dir::State</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -3522,6 +3466,13 @@ msgstr ""
msgid "The Acquire Group"
msgstr ""
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -3918,14 +3869,6 @@ msgid ""
"\"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" "
-"id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -4512,11 +4455,6 @@ msgid ""
"possible options."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr ""
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -4623,6 +4561,13 @@ msgid ""
"id=\"1\"/>"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
msgid "priority 1"
@@ -4674,14 +4619,6 @@ msgid "to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -4958,6 +4895,13 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -5029,14 +4973,6 @@ msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -5114,6 +5050,18 @@ msgid ""
"describe the packages available at that location."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
+"for example, "
+"<filename>.../dists/stable/main/binary-i386/Packages</filename>. It "
+"consists of a series of multi-line records, one for each package available "
+"in that directory. Only two lines in each record are relevant for setting "
+"APT priorities:"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -5135,15 +5083,16 @@ msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
-"for example, "
-"<filename>.../dists/stable/main/binary-i386/Packages</filename>. It "
-"consists of a series of multi-line records, one for each package available "
-"in that directory. Only two lines in each record are relevant for setting "
-"APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or "
+"<filename>.../dists/&stable-codename;/Release</filename>. It consists of a "
+"single multi-line record which applies to <emphasis>all</emphasis> of the "
+"packages in the directory tree below its parent. Unlike the "
+"<filename>Packages</filename> file, nearly all of the lines in a "
+"<filename>Release</filename> file are relevant for setting APT priorities:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -5194,8 +5143,8 @@ msgstr ""
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
-"no version number for the <literal>testing</literal> and "
+"belong to Debian release version 3.0. Note that there is normally no "
+"version number for the <literal>testing</literal> and "
"<literal>unstable</literal> distributions because they have not been "
"released yet. Specifying this in the APT preferences file would require one "
"of the following lines."
@@ -5274,20 +5223,6 @@ msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or "
-"<filename>.../dists/&stable-codename;/Release</filename>. It consists of a "
-"single multi-line record which applies to <emphasis>all</emphasis> of the "
-"packages in the directory tree below its parent. Unlike the "
-"<filename>Packages</filename> file, nearly all of the lines in a "
-"<filename>Release</filename> file are relevant for setting APT priorities: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -5507,11 +5442,6 @@ msgid ""
"version. <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5527,8 +5457,8 @@ msgstr ""
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 <filename>/etc/apt/sources.list</filename>."
+"documents only the packaging system used by the Debian system. This control "
+"file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -5697,39 +5627,29 @@ msgstr ""
msgid "URI specification"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
"archives."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
"list."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -5739,13 +5659,8 @@ msgid ""
"method of authentication."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -5756,31 +5671,16 @@ msgid ""
"file will be ignored."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using a zip disk to copy files around with APT."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -5790,68 +5690,59 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
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. maintains also the <literal>apt-transport-https</literal> package "
+"<package>apt-transport-<replaceable>method</replaceable></package>. The APT "
+"team e.g. maintains also the <package>apt-transport-https</package> package "
"which provides access methods for https-URIs with features similar 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>."
+"see &apt-transport-debtorrent;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
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:217
+#: sources.list.5.xml:214
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5859,7 +5750,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5867,33 +5758,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
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:232
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -5902,19 +5793,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -5926,7 +5817,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr ""
@@ -5969,7 +5860,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file "
+"For more details, on Debian systems, see the file "
"/usr/share/common-licenses/GPL for the full license."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 2b718b77d..ff7f3c661 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.8.15-9\n"
+"Project-Id-Version: apt-doc 0.9.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 15:47+0300\n"
+"POT-Creation-Date: 2012-05-23 01:20+0300\n"
"PO-Revision-Date: 2012-05-21 23:18+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -31,8 +31,8 @@ msgstr "16. Juni 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -389,20 +389,19 @@ msgstr ""
" Konfigurationselement: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
-# FIXME s/appended)./appended.)/
#. type: Plain text
#: apt.ent:109
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Speicherbereich für Paketdateien auf dem Transportweg.\n"
-" Konfigurationselement: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> wird implizit angehängt.)</para></listitem>\n"
+" Konfigurationselement: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> wird implizit angehängt)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -495,20 +494,19 @@ msgstr ""
" Konfigurationselement: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
-# FIXME s/appended)./appended.)/
#. type: Plain text
#: apt.ent:150
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Speicherbereich für Statusinformationen auf dem Transportweg.\n"
-" Konfigurationselement: <literal>Dir::State::Lists</literal> (<filename>partial</filename> wird implizit angehängt.)</para></listitem>\n"
+" Konfigurationselement: <literal>Dir::State::Lists</literal> (<filename>partial</filename> wird implizit angehängt)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -777,7 +775,8 @@ msgstr ""
"und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -797,8 +796,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -908,7 +907,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -924,7 +923,7 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Single virtual packages</literal> ist die Anzahl der Pakete mit nur "
@@ -937,7 +936,7 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mixed virtual packages</literal> ist die Anzahl der Pakete, die "
@@ -1044,20 +1043,17 @@ msgstr "&synopsis-regex;"
#: apt-cache.8.xml:170
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
"<literal>search</literal> führt eine Volltextsuche in der Liste aller "
"verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. Es durchsucht die Paketnamen und "
+"&regex;. Es durchsucht die Paketnamen und "
"die Beschreibungen nach einem Vorkommen des regulären Ausdrucks und gibt den "
"Paketnamen mit einer kurzen Beschreibung, einschließlich virtueller "
"Paketnamen, aus. Wenn <option>--full</option> angegeben wurde, ist die "
@@ -1066,7 +1062,7 @@ msgstr ""
"Beschreibung nicht durchsucht, sondern nur der Paketname."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1075,7 +1071,7 @@ msgstr ""
"die »und«-verknüpft werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1085,7 +1081,7 @@ msgstr ""
"können."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1094,12 +1090,12 @@ msgstr ""
"Rückwärtsabhängigkeit, die ein Paket hat."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -1114,7 +1110,7 @@ msgstr ""
"besten mit der <option>--generate</option>-Option benutzt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -1125,7 +1121,7 @@ msgstr ""
"Pakete sind z.B. auch in der generierten Liste aufgeführt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1147,7 +1143,7 @@ msgstr ""
"GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1161,14 +1157,14 @@ msgstr ""
"depends, grüne Linien sind Konflikte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
"darstellen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1178,12 +1174,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1196,7 +1192,7 @@ msgstr ""
"Informationen über die Prioritätenauswahl der genannten Pakete aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1215,14 +1211,14 @@ msgstr ""
"(<literal>APT::Architecture</literal>)."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "Optionen"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1234,7 +1230,7 @@ msgstr ""
"pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1251,7 +1247,7 @@ msgstr ""
"srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1265,7 +1261,7 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1276,7 +1272,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -1292,7 +1288,7 @@ msgstr ""
"Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1301,7 +1297,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1318,7 +1314,7 @@ msgstr ""
"anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1330,7 +1326,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1339,7 +1335,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1350,7 +1346,7 @@ msgstr ""
"<literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1361,7 +1357,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1371,47 +1367,35 @@ msgstr ""
"literal> auf Pakete, die aktuell installiert sind. Konfigurationselement: "
"<literal>APT::Cache::Installed</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "Dateien"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr "Siehe auch"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnose"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1449,7 +1433,7 @@ msgstr ""
"Medium in einer Zusammenstellung aus mehreren CDs einzeln eingelegt und "
"gescannt werden, um auf mögliche Fehlbrennungen zu testen."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1464,7 +1448,7 @@ msgstr ""
"fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-"
"Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1475,7 +1459,7 @@ msgstr ""
"Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in "
"<filename>&statedir;/cdroms.list</filename>"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
@@ -1484,24 +1468,13 @@ msgstr ""
"ein Fehlersuchwerkzeug, um die Identität des aktuellen Mediums sowie den "
"gespeicherten Dateinamen zu berichten"
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"Außer wenn die Option <option>-h</option> oder <option>--help</option> "
-"angegeben wurde, muss einer der beiden Befehle unterhalb gegeben sein. "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr "Optionen"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1513,7 +1486,7 @@ msgstr ""
"cdrom::mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1525,7 +1498,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1536,7 +1509,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1549,7 +1522,7 @@ msgstr ""
"festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1560,7 +1533,7 @@ msgstr ""
"Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1571,12 +1544,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1603,15 +1576,6 @@ msgstr ""
"apt/apt.conf</filename> auf eine Art zu, die leicht für geskriptete "
"Anwendungen zu benutzen ist."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"Außer, wenn die <option>-h</option>- oder <option>--help</option>-Option "
-"angegeben wurde, muss einer der Befehle unterhalb vorkommen."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -2001,8 +1965,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "Dir-Abschnitt"
+msgid "<literal>Dir</literal> Section"
+msgstr "<literal>Dir</literal>-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:146
@@ -2050,8 +2014,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr "Default-Abschnitt"
+msgid "<literal>Default</literal> Section"
+msgstr "<literal>Default</literal>-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:178
@@ -2154,8 +2118,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr "TreeDefault-Abschnitt"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "<literal>TreeDefault</literal>-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:244
@@ -2309,8 +2273,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr "Tree-Abschnitt"
+msgid "<literal>Tree</literal> Section"
+msgstr "<literal>Tree</literal>-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:344
@@ -2427,11 +2391,10 @@ msgstr "setzt die zusätzliche Programm-Override-Datei"
msgid "Sets the source extra override file."
msgstr "setzt die zusätzliche Quell-Override-Datei"
-# FIXME <literal>?
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr "BinDirectory-Abschnitt"
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "<literal>BinDirectory</literal>-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:412
@@ -2729,7 +2692,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr "Beispiele"
@@ -2872,7 +2835,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2885,7 +2848,7 @@ msgstr ""
"<literal>install</literal> wird gefolgt von einem oder mehreren gewünschten "
"Paketen zur Installation oder zum Upgrade. Jedes Paket ist ein Paketname, "
"kein vollständig zusammengesetzter Dateiname (zum Beispiel wäre in einem "
-"»Debian GNU/Linux«-System libc6 das bereitgestellte Argument, nicht "
+"»Debian«-System libc6 das bereitgestellte Argument, nicht "
"<literal>libc6_1.9.6-2.deb</literal>). Alle von den zur Installation "
"angegebenen Paketen benötigten Pakete werden zusätzlich heruntergeladen und "
"installiert. Die <filename>/etc/apt/sources.list</filename>-Datei wird "
@@ -3639,15 +3602,6 @@ msgstr ""
"fragen. Dies ist für Werkzeuge wie pbuilder nützlich. Konfigurationselement: "
"<literal>APT::Get::AllowUnauthenticated</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-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:530
msgid ""
@@ -3802,11 +3756,6 @@ msgstr ""
"<filename>trusted.gpg</filename> der primäre Schlüsselbund wird, d.h. neue "
"Schlüssel werden zu diesem hinzugefügt."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -3967,39 +3916,22 @@ msgstr ""
"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
-# FIXME not translatable
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr "<replaceable>&synopsis-filename;</replaceable>"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename>, anstatt "
+"&synopsis-param-filename;, anstatt "
"vom Standardort, der <filename>extended_status</filename> im von "
"Konfigurationselement <literal>Dir::State</literal> definierten Verzeichnis, "
"ist."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr " &file-extended_states;"
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4912,6 +4844,15 @@ msgstr ""
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen "
+"von Paketen und die URI-Steuerprogramme."
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -5531,16 +5472,6 @@ msgstr ""
"in <filename>/var/lib/apt/lists/</filename> gefunden werden, an das Ende der "
"Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen "
-"von Paketen und die URI-Steuerprogramme. <placeholder type=\"variablelist\" "
-"id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -6403,11 +6334,6 @@ msgstr ""
"&configureindex; ist eine Konfigurationsdatei, die Beispielwerte für alle "
"möglichen Optionen zeigen."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -6561,6 +6487,16 @@ msgstr ""
"mit Pinning gewichteten Paketen. Beispielsweise <placeholder type="
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+"Wenn das Ziel-Release angegeben wurde, dann benutzt APT den folgenden "
+"Algorithmus, um die Prioritäten der Versionen eines Paketes zu setzen. "
+"Zuweisung:"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
msgid "priority 1"
@@ -6625,17 +6561,6 @@ msgstr ""
"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Wenn das Ziel-Release angegeben wurde, dann benutzt APT den folgenden "
-"Algorithmus, um die Prioritäten der Versionen eines Paketes zu setzen. "
-"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -7029,6 +6954,16 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+"Die in der APT-Einstellungsdatei zugewiesenen Prioritäten (P) müssen "
+"positive oder negative Ganzzahlen sein. Sie werden wie folgt interpretiert "
+"(grob gesagt):"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -7112,17 +7047,6 @@ msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Die in der APT-Einstellungsdatei zugewiesenen Prioritäten (P) müssen "
-"positive oder negative Ganzzahlen sein. Sie werden wie folgt interpretiert "
-"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -7234,6 +7158,25 @@ msgstr ""
"<filename>Packages</filename>- und <filename>Release</filename>-Dateien "
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis "
+"<filename>…/dists/<replaceable>Distributions-Name</replaceable>/"
+"<replaceable>Komponente</replaceable>/<replaceable>Architektur</"
+"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/main/"
+"binary-i386/Packages</filename>. Sie besteht aus einer Serie mehrzeiliger "
+"Datensätze, einem für jedes verfügbare Paket in diesem Verzeichnis. In jedem "
+"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -7255,25 +7198,26 @@ msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
-"Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis "
-"<filename>…/dists/<replaceable>Distributions-Name</replaceable>/"
-"<replaceable>Komponente</replaceable>/<replaceable>Architektur</"
-"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/main/"
-"binary-i386/Packages</filename>. Sie besteht aus einer Serie mehrzeiliger "
-"Datensätze, einem für jedes verfügbare Paket in diesem Verzeichnis. In jedem "
-"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
+"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
+"finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
+"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
+"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
+"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
+"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu "
+"alle Zeilen in einer <filename>Release</filename>-Datei für das Setzen von "
+"APT-Prioritäten relevant:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:428
@@ -7335,13 +7279,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur "
-"Debian GNU/Linux-Release-Version 3.0 gehören. Beachten Sie, dass es "
+"Debian-Release-Version 3.0 gehören. Beachten Sie, dass es "
"normalerweise keine Versionsnummer für <literal>testing</literal>- und "
"<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht "
"veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde "
@@ -7436,29 +7380,6 @@ msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
-"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
-"finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
-"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
-"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
-"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
-"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu "
-"alle Zeilen in einer <filename>Release</filename>-Datei für das Setzen von "
-"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7784,11 +7705,6 @@ msgstr ""
"aktueller als die installierte Version ist. <placeholder type="
"\"programlisting\" id=\"0\"/>"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7804,7 +7720,7 @@ msgstr "Paketressourcenliste für APT"
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
@@ -8062,13 +7978,15 @@ msgstr ""
msgid "URI specification"
msgstr "URI-Beschreibung"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "weitere erkennbare URI-Typen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8078,13 +7996,8 @@ msgstr ""
"Archiv betrachtet zu werden. Dies ist nützlich für eingehängtes NFS und "
"lokale Spiegel oder Archive."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8093,13 +8006,8 @@ msgstr ""
"zu benutzen. Benutzen Sie das Programm &apt-cdrom;, um CD-ROM-Einträge in "
"der Quellenliste zu erstellen."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -8115,13 +8023,8 @@ msgstr ""
"Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ benutzt. "
"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8140,13 +8043,8 @@ msgstr ""
"verstehen oft auch FTP-URLs). FTP-Proxys, die gemäß Angabe in der "
"Konfigurationsdatei HTTP benutzen, werden ignoriert."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8157,18 +8055,8 @@ msgstr ""
"Herkunftsort benutzt zu werden. Dies ist für Leute nützlich, die eine ZIP-"
"Platte benutzen, um Dateien mit APT umherzukopieren."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8184,21 +8072,22 @@ msgstr ""
"aus der Ferne durchzuführen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
msgstr "weitere erkennbare URI-Typen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
"APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
"werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
@@ -8206,21 +8095,10 @@ msgstr ""
"betreut z.B. außerdem das Paket <literal>apt-transport-https</literal>, das "
"Zugriffsmethoden für HTTPS-URIs mit Funktionen bereitstellt, die denen der "
"HTTP-Methode ähneln, bei der aber andere Methoden für z.B. debtorrent "
-"verfügbar sind, siehe <citerefentry> <refentrytitle><filename>apt-transport-"
-"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
-"citerefentry>."
+"verfügbar sind, siehe &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, »copy«, "
-"»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8229,37 +8107,37 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
#, 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:219
+#: sources.list.5.xml:216
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:220
+#: sources.list.5.xml:217
#, 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:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8270,7 +8148,7 @@ msgstr ""
"<literal>amd64</literal> und <literal>armel</literal> holt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -8280,7 +8158,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8289,13 +8167,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
#, 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:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -8305,13 +8183,13 @@ msgstr ""
"benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -8325,19 +8203,19 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, 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><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8357,7 +8235,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -8405,7 +8283,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
"Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
@@ -9934,3 +9812,11 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#, fuzzy
+#~ msgid ""
+#~ "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
+#~ "rsh."
+#~ msgstr ""
+#~ "Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, "
+#~ "»copy«, »ssh«, »rsh«."
diff --git a/doc/po/es.po b/doc/po/es.po
index 51e1aa592..441f0ae5c 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -37,7 +37,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\n"
"PO-Revision-Date: 2010-08-25 03:25+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -63,8 +63,8 @@ msgstr "16 de Junio de 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -437,7 +437,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -548,7 +548,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -835,7 +835,8 @@ msgstr ""
"genera información interesante a partir de los metadatos del paquete."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -852,8 +853,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -963,7 +964,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -980,12 +981,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Paquetes virtuales únicos</literal> es el número de paquetes con un "
"único paquete que proporciona un paquete virtual en concreto. Por ejemplo, "
-"en un sistema Debian GNU/Linux, «X11-text-viewer» es un paquete virtual, "
+"en un sistema Debian, «X11-text-viewer» es un paquete virtual, "
"pero sólo un paquete, xless, proporciona «X11-text-viewer»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -993,13 +994,13 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Paquetes virtuales mixtos</literal> es el número de paquetes que o "
"bien proporcionan un determinado paquete virtual o tienen el mismo nombre "
"como paquete virtual y como paquete normal. Por ejemplo, en un sistema "
-"Debian GNU/Linux debconf es a la vez un paquete normal, y lo proporciona el "
+"Debian debconf es a la vez un paquete normal, y lo proporciona el "
"paquete debconf-tiny."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -1098,17 +1099,27 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>. It searches the package names "
+#| "and the descriptions for an occurrence of the regular expression and "
+#| "prints out the package name and the short description, including virtual "
+#| "package names. If <option>--full</option> is given then output identical "
+#| "to <literal>show</literal> is produced for each matched package, and if "
+#| "<option>--names-only</option> is given then the long description is not "
+#| "searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
"<literal>search</literal> realiza una búsqueda de la expresión regular POSIX "
"proporcionada en todo el texto de todos los paquetes disponibles, véase "
@@ -1122,7 +1133,7 @@ msgstr ""
"sólo se busca en el nombre de los paquetes, no en la descripción larga."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1131,7 +1142,7 @@ msgstr ""
"búsqueda que se juntarán mediante una «Y lógica»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1140,7 +1151,7 @@ msgstr ""
"paquete y de todos los demás paquetes que la pueden satisfacer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1148,14 +1159,12 @@ msgstr ""
"<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
-#, fuzzy
-#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
-msgstr "pkgnames <replaceable>[ prefijo ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -1171,7 +1180,7 @@ msgstr ""
"generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -1182,7 +1191,7 @@ msgstr ""
"virtuales también aparecen en la lista generada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1203,7 +1212,7 @@ msgstr ""
"active la opción <literal>APT::Cache::GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1218,12 +1227,12 @@ msgstr ""
"líneas verdes son conflictos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1233,14 +1242,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
-msgstr "madison <replaceable>[ paquete(s) ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1253,7 +1260,7 @@ msgstr ""
"detallada acerca de la prioridad de selección del paquete nombrado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1272,14 +1279,14 @@ msgstr ""
"paquetes (<literal>APT::Architecture</literal>)."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1290,7 +1297,7 @@ msgstr ""
"configuración: <literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1305,7 +1312,7 @@ msgstr ""
"Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1319,7 +1326,7 @@ msgstr ""
"configuración: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1330,14 +1337,7 @@ msgstr ""
"configuración: <literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
-#, fuzzy
-#| msgid ""
-#| "Per default the <literal>depends</literal> and <literal>rdepends</"
-#| "literal> print all dependencies. This can be twicked with these flags "
-#| "which will omit the specified dependency type. Configuration Item: "
-#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
-#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
+#: apt-cache.8.xml:287
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -1353,7 +1353,7 @@ msgstr ""
"<literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1362,7 +1362,7 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1379,7 +1379,7 @@ msgstr ""
"configuración: <literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1391,7 +1391,7 @@ msgstr ""
"Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1400,7 +1400,7 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1411,7 +1411,7 @@ msgstr ""
"configuración: <literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1422,7 +1422,7 @@ msgstr ""
"vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1432,47 +1432,35 @@ msgstr ""
"a paquetes actualmente instalados. Opción de configuración: <literal>APT::"
"Cache::Installed</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "Ficheros"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr "Véase también"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnósticos"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1510,7 +1498,7 @@ msgstr ""
"cada disco de un conjunto de discos por separado, para poder detectar los "
"posibles errores de grabación."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1525,7 +1513,7 @@ msgstr ""
"contiene un directorio <filename>disk</filename> apropiado, se le pedirá un "
"título descriptivo."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1536,7 +1524,7 @@ msgstr ""
"en la unidad lectora y mantiene una lista de estos identificadores en "
"<filename>&statedir;/cdroms.list</filename>"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
@@ -1545,24 +1533,13 @@ msgstr ""
"Una herramienta de depuración para informar de la identidad del disco actual "
"así como del nombre del fichero guardado."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"Se debe proporcionar alguna de las siguientes órdenes, a menos que se "
-"proporcione una de las opciones <option>-h</option> o <option>--help</"
-"option>. <placeholder type=\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1574,7 +1551,7 @@ msgstr ""
"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1586,7 +1563,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1596,7 +1573,7 @@ msgstr ""
"de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1609,7 +1586,7 @@ msgstr ""
"de configuración: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1621,7 +1598,7 @@ msgstr ""
"pero encontrará todo el contenido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1632,12 +1609,12 @@ msgstr ""
"CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1664,16 +1641,6 @@ msgstr ""
"configuración <filename>/etc/apt/apt.conf</filename> de forma que resulta "
"sencillo de usar por aplicaciones con scripts."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"Se debe proporcionar alguna de las siguientes órdenes, a menos que se "
-"proporcione una de las opciones <option>-h</option> o <option>--help</"
-"option>."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -1802,13 +1769,6 @@ msgstr "paquete versión fichero-de-plantilla script-de-configuración"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:45
-#, fuzzy
-#| msgid ""
-#| "template-file and config-script are written to the temporary directory "
-#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
-#| "TempDir</literal>) directory, with filenames of the form "
-#| "<filename>package.template.XXXX</filename> and <filename>package.config."
-#| "XXXX</filename>"
msgid ""
"template-file and config-script are written to the temporary directory "
"specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -1817,10 +1777,10 @@ msgid ""
"<filename>package.config.XXXX</filename>"
msgstr ""
"El fichero de plantilla y el script de configuración se escribirán en el "
-"directorio temporal definido mediante la opción «-t» o «--"
-"tempdir» (<literal>APT::ExtractTemplates::TempDir</literal>), los nombres de "
-"los ficheros tendrán la forma <filename>paquete.template.XXXX</filename> y "
-"<filename>paquete.config.XXXX</filename>"
+"directorio temporal definido mediante la opción <option>-t</option> o "
+"<option>--tempdir</option> (<literal>APT::ExtractTemplates::TempDir</"
+"literal>), los nombres de los ficheros tendrán la forma <filename>paquete."
+"template.XXXX</filename> y <filename>paquete.config.XXXX</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
@@ -2049,8 +2009,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "Sección Dir"
+msgid "<literal>Dir</literal> Section"
+msgstr "Sección <literal>Dir</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:146
@@ -2097,8 +2057,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr "Sección Default"
+msgid "<literal>Default</literal> Section"
+msgstr "Sección <literal>Default</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:178
@@ -2203,8 +2163,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr "Sección TreeDefault"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "Sección <literal>TreeDefault</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:244
@@ -2363,8 +2323,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr "Sección Tree"
+msgid "<literal>Tree</literal> Section"
+msgstr "Sección <literal>Tree</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:344
@@ -2482,8 +2442,8 @@ msgstr "Define el fichero de fuentes alternativo adicional."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr "Sección BinDirectory"
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "Sección <literal>BinDirectory</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:412
@@ -2786,7 +2746,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr "Ejemplos"
@@ -2928,7 +2888,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -3409,16 +3369,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:354
-#, fuzzy
-#| msgid ""
-#| "Compile source packages after downloading them. Configuration Item: "
-#| "<literal>APT::Get::Compile</literal>."
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
msgstr ""
-"Descarga los paquetes fuente y luego los compila. Opción de configuración: "
-"<literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
@@ -3695,15 +3649,6 @@ msgstr ""
"sobre ello. Esto es útil para herramientas como pbuilder. Opción de "
"configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-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:530
msgid ""
@@ -3769,12 +3714,10 @@ msgstr "Elimina una clave de la lista de claves de confianza."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:74
-#, fuzzy
-#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgid "Output the key &synopsis-param-keyid; to standard output."
msgstr ""
-"Devuelve la clave identificada por el <replaceable>identificador-de-la-"
-"clave</replaceable> por la salida estándar."
+"Devuelve la clave identificada por el &synopsis-param-keyid; por la salida "
+"estándar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:85
@@ -3832,14 +3775,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:164
-#, fuzzy
-#| msgid ""
-#| "With this option it is possible to specify a specific keyring file the "
-#| "command should operate on. The default is that a command is executed on "
-#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#| "added to this one."
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3855,11 +3790,6 @@ msgstr ""
"aunque <filename>trusted.gpg</filename> es el registro de claves principal, "
"esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -4027,46 +3957,21 @@ msgstr ""
"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
"instalados automáticamente, un paquete por línea."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr "xvcg <replaceable>paquete(s)</replaceable>"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
-#, fuzzy
-#| 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>."
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
-"Escribe y lee las estadísticas de los paquetes desde "
-"<filename><replaceable>nombre-de-fichero</replaceable></filename> en lugar "
-"de la ubicación predeterminada, que es <filename>extended_status</filename> "
-"en el directorio definido en la opción de configuración: <literal>Dir::"
-"State</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr " &file-extended_states;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
+"Escribe y lee las estadísticas de los paquetes desde &synopsis-param-"
+"filename; en lugar de la ubicación predeterminada, que es "
+"<filename>extended_status</filename> en el directorio definido en la opción "
+"de configuración: <literal>Dir::State</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4368,14 +4273,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:198
-#, fuzzy
-#| msgid ""
-#| "For more background information you might want to review the <ulink url="
-#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
-#| "Manual (available also in the harden-doc package) and the <ulink url="
-#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-#| "Distribution HOWTO</ulink> by V. Alex Brennen."
msgid ""
"For more background information you might want to review the <ulink url="
"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -4385,9 +4282,9 @@ msgid ""
"ulink> by V. Alex Brennen."
msgstr ""
"Para más información puede que quiera revisar el capítulo de la <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-"\">Infraestructura de Seguridad de Debian</ulink> del Manual de Seguridad de "
-"Debian (también disponible en el paquete harden-doc) y el <ulink url="
+"\"http://www.debian.org/doc/manuals/securing-debian-howto/"
+"ch7\">Infraestructura de Seguridad de Debian</ulink> del Manual de Seguridad "
+"de Debian (también disponible en el paquete harden-doc) y el <ulink url="
"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >COMO Fortificar "
"una Distribución</ulink> de V. Alex Brennen."
@@ -5013,6 +4910,15 @@ msgstr ""
msgid "The Acquire Group"
msgstr "El grupo Acquire"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"El grupo de opciones <literal>Acquire</literal> controla la descarga de "
+"paquetes y los gestores de URI."
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -5651,15 +5557,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"El grupo de opciones <literal>Acquire</literal> controla la descarga de "
-"paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -6535,11 +6432,6 @@ msgstr ""
"&configureindex; es un fichero de configuración de ejemplo que muestra "
"valores de ejemplo para todas las opciones posibles."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -6697,6 +6589,16 @@ msgstr ""
"paquetes específicos. Por ejemplo, <placeholder type=\"programlisting\" id="
"\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+"Si se ha especificado una distribución objetivo, APT usa el siguiente "
+"algoritmo para establecer las prioridades de cada versión de un paquete. "
+"Asignar:"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
msgid "priority 1"
@@ -6769,17 +6671,6 @@ msgstr ""
"objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Si se ha especificado una distribución objetivo, APT usa el siguiente "
-"algoritmo para establecer las prioridades de cada versión de un paquete. "
-"Asignar: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
#, fuzzy
#| msgid ""
@@ -7113,19 +7004,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
"Pin: release n=experimental\n"
"Pin-Priority: 500\n"
msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:279
@@ -7137,19 +7024,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=karmic*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:291
@@ -7167,6 +7050,16 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+"Las prioridades (P) asignadas en el fichero de preferencias deben ser "
+"números enteros positivos o negativos. Se interpretan (en general) del "
+"siguiente modo:"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -7248,17 +7141,6 @@ msgid "prevents the version from being installed"
msgstr "Evita la instalación de la versión."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Las prioridades (P) asignadas en el fichero de preferencias deben ser "
-"números enteros positivos o negativos. Se interpretan (en general) del "
-"siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -7369,6 +7251,26 @@ msgstr ""
"ficheros <filename>Packages</filename> y <filename>Release</filename>. Éstos "
"describen los paquetes disponibles en cada uno de los sitios."
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"El fichero <filename>Packages</filename> se suele encontrar en el directorio "
+"<filename>.../dists/<replaceable>nombre-dist</replaceable>/"
+"<replaceable>componente</replaceable>/<replaceable>arquitectura</"
+"replaceable></filename>, por ejemplo, <filename>.../dists/stable/main/binary-"
+"i386/Packages</filename>. Este fichero consiste en una serie de registros de "
+"varias líneas, uno por cada paquete disponible en ese directorio. Sólo dos "
+"líneas en cada registro son relevantes a la hora de definir las prioridades "
+"de APT:"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -7390,25 +7292,25 @@ msgid "gives the version number for the named package"
msgstr "indica el número de versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
-"El fichero <filename>Packages</filename> se suele encontrar en el directorio "
-"<filename>.../dists/<replaceable>nombre-dist</replaceable>/"
-"<replaceable>componente</replaceable>/<replaceable>arquitectura</"
-"replaceable></filename>, por ejemplo, <filename>.../dists/stable/main/binary-"
-"i386/Packages</filename>. Este fichero consiste en una serie de registros de "
-"varias líneas, uno por cada paquete disponible en ese directorio. Sólo dos "
-"líneas en cada registro son relevantes a la hora de definir las prioridades "
-"de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+"El fichero <filename>Release</filename> se suele encontrar en el directorio "
+"<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por "
+"ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/"
+"&stable-codename;/Release</filename>. El fichero consiste en registros de "
+"una sola línea que se aplican a <emphasis>todos</emphasis> los paquetes por "
+"debajo del directorio padre. Al contrario que el fichero <filename>Packages</"
+"filename>, casi todas las líneas del fichero <filename>Release</filename> "
+"son relevantes para las prioridades de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:428
@@ -7473,13 +7375,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol "
-"pueden pertenecer a la versión 3.0 de Debian GNU/Linux. Observe que, "
+"pueden pertenecer a la versión 3.0 de Debian. Observe que, "
"generalmente, <literal>testing</literal> y <literal>unstable</literal> no "
"tienen una versión asignada porque no se han publicado. Para especificar una "
"preferencia de acuerdo con este parámetro tendrá que poner una de las "
@@ -7576,29 +7478,6 @@ msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"El fichero <filename>Release</filename> se suele encontrar en el directorio "
-"<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por "
-"ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/"
-"&stable-codename;/Release</filename>. El fichero consiste en registros de "
-"una sola línea que se aplican a <emphasis>todos</emphasis> los paquetes por "
-"debajo del directorio padre. Al contrario que el fichero <filename>Packages</"
-"filename>, casi todas las líneas del fichero <filename>Release</filename> "
-"son relevantes para las prioridades de APT: <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7922,11 +7801,6 @@ msgstr ""
"distribución <literal>sid</literal> si es más reciente que la versión "
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7942,13 +7816,13 @@ msgstr "Lista de los repositorios de paquetes para APT"
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"La lista de los repositorios de paquetes se usa para ubicar los archivos de "
"Debian del sistema de distribución de paquetes en uso en el sistema. A día "
"de hoy, esta página del manual documenta sólo el sistema de paquetes que usa "
-"Debian GNU/Linux. Este fichero de control está ubicado en <filename>/etc/apt/"
+"Debian. Este fichero de control está ubicado en <filename>/etc/apt/"
"sources.list</filename>"
#. type: Content of: <refentry><refsect1><para>
@@ -8194,13 +8068,15 @@ msgstr ""
msgid "URI specification"
msgstr "Especificación de la URI"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "Otros tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8210,13 +8086,8 @@ msgstr ""
"ficheros como un archivo de paquetes adicional. Esto es útil para "
"particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8225,13 +8096,8 @@ msgstr ""
"programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
"list»."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -8247,13 +8113,8 @@ msgstr ""
"usar la cadena de caracteres «http://usuario:contraseña@servidor:puerto/». "
"Tenga en cuenta que este método de autenticación no es seguro."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8271,13 +8132,8 @@ msgstr ""
"comprenden las url de tipo ftp) usando este método y SÓLO este método. Se "
"ignorarán proxies ftp definidos en el fichero de configuración que usen http."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8287,18 +8143,8 @@ msgstr ""
"directorio almacén en vez de usarlos directamente en su ubicación original. "
"Esto es útil para gente que use discos zip con APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8313,21 +8159,32 @@ msgstr ""
"command> y <command>dd</command> para realizar la transferencia de ficheros."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
msgstr "Otros tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
+#, fuzzy
+#| 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. maintains "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similar 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>."
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
"Puede extender APT con más métodos, proporcionados en otros paquetes "
"opcionales que siguen el esquema de nombre <literal>apt-transport-"
@@ -8339,16 +8196,7 @@ msgstr ""
"filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Los tipos de URI reconocidos son cdrom, file, http, ftp, copy, ssh y rsh. "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8357,36 +8205,36 @@ msgstr ""
"«stable/main», «stable/contrib», y «stable/non-free»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
#, 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:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, 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:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr "Línea para obtener el código fuente desde la ubicación anterior."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8394,22 +8242,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-#| " "
+#: sources.list.5.xml:224
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8418,13 +8261,13 @@ msgstr ""
"sólo la sección «hamm/main»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
#, 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:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -8433,13 +8276,13 @@ msgstr ""
"directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -8452,20 +8295,19 @@ msgstr ""
"filename>, se usará sólo una sesión FTP para ambas."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, 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><literallayout>
-#: sources.list.5.xml:251
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#: sources.list.5.xml:248
+#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -8473,8 +8315,7 @@ msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
#| "filename> on m68k, and so forth for other supported architectures. [Note "
#| "this example only illustrates how to use the substitution variable; non-"
-#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
-#| "id=\"0\"/>"
+#| "us is no longer structured like this]"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8490,10 +8331,10 @@ msgstr ""
"<filename>unstable/binary-m68k</filename> en máquinas m68k, y así para todas "
"las arquitecturas compatibles. (Tenga en cuenta que este ejemplo sólo sirve "
"para ilustrar cómo se usa la variable de sustitución, «non-us» ya tiene esta "
-"estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
+"estructura.)"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -8541,10 +8382,10 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"Para más detalles acerca de sistemas Debian GNU/Linux y la licencia "
+"Para más detalles acerca de sistemas Debian y la licencia "
"completa, consulte el fichero «/usr/share/common-licenses/GPL»."
#. type: <heading></heading>
@@ -10038,142 +9879,6 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Ésto usará los archivos del disco previamente obtenidos."
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 de Agosto de 2009</date>"
-
-#~ msgid "ORIGINAL AUTHORS"
-#~ msgstr "AUTORES ORIGINALES"
-
-#~ msgid "&apt-author.jgunthorpe;"
-#~ msgstr "&apt-author.jgunthorpe;"
-
-#~ msgid "CURRENT AUTHORS"
-#~ msgstr "AUTORES ACTUALES"
-
-#~ msgid "&apt-author.team;"
-#~ msgstr "&apt-author.team;"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 de Agosto de 2009</date>"
-
-#, 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>16 January 2010</date>"
-#~ 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;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#~ "firstname> <surname>Burrows</surname> <contrib>Documentación inicial de "
-#~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#~ "email; &apt-product; <date>16 de Enero de 2009</date>"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-#~ msgid "&apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>16 de Febrero 2010</"
-#~ "date>"
-
-#~ msgid ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 October 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-#~ msgstr ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 de Octubre de 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>14 February 2004</date>"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>2012-05-21T05:49:00+01:00</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 de Febrero de 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 de Febrero de 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 de Febrero de 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 de Agosto de 2009</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 November 2008</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 de Noviembre de 2008</date>"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>9 August 2009</date>"
-#~ msgid ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>21 April 2011</date>"
-#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#~ "de Agosto de 2009</date>"
-
#~ msgid ""
#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
#~ "get check</command>. It builds the source and package caches from the "
@@ -10331,13 +10036,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
#~ "Usa HTTP para acceder al archivo de Debian en «nonus.debian.org», bajo el "
#~ "directorio debian-non-US."
-#~ 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"
-
#~ msgid "OPTIONS"
#~ msgstr "OPCIONES"
@@ -10347,9 +10045,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
#~ msgid "FILES"
#~ msgstr "FICHEROS"
-#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
-#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
#~ msgid ""
#~ "Status list of auto-installed packages. Configuration Item: "
#~ "<literal>Dir::State</literal> sets the path to the "
@@ -10367,9 +10062,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
#~ "almacenar la información «disponible». Esto limita el tamaño de esa caché "
#~ "(en bytes)."
-#~ msgid "Pin: release n=squeeze\n"
-#~ msgstr "Pin: release n=squeeze\n"
-
#~ msgid ""
#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index a58bb36c9..28411af59 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\n"
"PO-Revision-Date: 2011-02-17 07:50+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -36,8 +36,8 @@ msgstr "16 Juin 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -408,7 +408,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -786,7 +786,8 @@ msgstr ""
"desquelles il extrait les informations intéressantes."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -803,8 +804,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -915,7 +916,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -932,12 +933,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Single virtual packages</literal> est le nombre de paquets virtuels "
"qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du "
-"système Debian GNU/Linux, « X11-text-viewer » est un paquet virtuel ; seul "
+"système Debian, « X11-text-viewer » est un paquet virtuel ; seul "
"le paquet « xless » remplit « X11-text-viewer »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -945,12 +946,12 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mixed virtual packages</literal> est le nombre de paquets qui "
"remplissent un paquet virtuel particulier ou dont le nom est un nom de "
-"paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, "
+"paquet virtuel. Par exemple, au sein du système Debian, "
"« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -1048,17 +1049,27 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>. It searches the package names "
+#| "and the descriptions for an occurrence of the regular expression and "
+#| "prints out the package name and the short description, including virtual "
+#| "package names. If <option>--full</option> is given then output identical "
+#| "to <literal>show</literal> is produced for each matched package, and if "
+#| "<option>--names-only</option> is given then the long description is not "
+#| "searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
"La commande <literal>search</literal> recherche l'expression rationnelle "
"donnée en paramètre sur tous les paquets disponibles. Elle cherche une "
@@ -1070,7 +1081,7 @@ msgstr ""
"seulement dans les noms de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1079,7 +1090,7 @@ msgstr ""
"rationnelles différentes sur lesquelles seront réalisées un « et » logique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1089,7 +1100,7 @@ msgstr ""
"satisfont ces dépendances."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1098,14 +1109,12 @@ msgstr ""
"dépendances inverses d'un paquet."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
-#, fuzzy
-#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
-msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -1120,7 +1129,7 @@ msgstr ""
"l'option <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -1131,7 +1140,7 @@ msgstr ""
"affichés dans la liste créée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1153,7 +1162,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1168,14 +1177,14 @@ msgstr ""
"conflits."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Attention, dotty ne peut pas représenter des ensembles très grands de "
"paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1185,14 +1194,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
-msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1205,7 +1212,7 @@ msgstr ""
"paquet donné en argument."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1225,14 +1232,14 @@ msgstr ""
"literal>)."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1243,7 +1250,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1259,7 +1266,7 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1274,7 +1281,7 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1285,14 +1292,7 @@ msgstr ""
"Élément de configuration : <literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
-#, fuzzy
-#| msgid ""
-#| "Per default the <literal>depends</literal> and <literal>rdepends</"
-#| "literal> print all dependencies. This can be twicked with these flags "
-#| "which will omit the specified dependency type. Configuration Item: "
-#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
-#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
+#: apt-cache.8.xml:287
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -1307,7 +1307,7 @@ msgstr ""
"replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1317,7 +1317,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1335,7 +1335,7 @@ msgstr ""
"<literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1347,7 +1347,7 @@ msgstr ""
"configuration : <literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1357,7 +1357,7 @@ msgstr ""
"NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1368,7 +1368,7 @@ msgstr ""
"configuration : <literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1380,7 +1380,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1390,47 +1390,35 @@ msgstr ""
"<literal>rdepends</literal> aux paquets qui sont actuellement installés. "
"Élément de configuration : <literal>APT::Cache::Installed</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "Fichiers"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr "Voir aussi"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnostics"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1468,7 +1456,7 @@ msgstr ""
"chaque disque d'un ensemble de CD doit être séparément inséré et parcouru "
"pour prendre en compte de possibles erreurs de gravure."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1483,7 +1471,7 @@ msgstr ""
"disque ne possède pas de répertoire <filename>disk/</filename> correct, un "
"titre descriptif est demandé."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1494,7 +1482,7 @@ msgstr ""
"actuellement dans le lecteur et maintient une base de données de ces "
"identifiants dans <filename>&statedir;/cdroms.list</filename>."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
@@ -1503,24 +1491,13 @@ msgstr ""
"Cette commande de débogage retourne l'identifiant du disque actuel ainsi que "
"le nom du fichier stocké."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"À moins que l'option <option>-h</option> ou <option>--help</option> ne soit "
-"donnée, l'une des commandes suivantes doit être présente. <placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1532,7 +1509,7 @@ msgstr ""
"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1544,7 +1521,7 @@ msgstr ""
"<literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1555,7 +1532,7 @@ msgstr ""
"NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1569,7 +1546,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1581,7 +1558,7 @@ msgstr ""
"le CD mais tous les paquets seront repérés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1592,12 +1569,12 @@ msgstr ""
"<literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1624,15 +1601,6 @@ msgstr ""
"utilisation simple du fichier de configuration principal <filename>/etc/apt/"
"apt.conf</filename>."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"À moins que l'option <option>-h</option> ou <option>--help</option> ne soit "
-"donnée, l'une des commandes suivantes doit être présente."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -1760,13 +1728,6 @@ msgstr "paquet version guide-de-configuration script-de-configuration"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:45
-#, fuzzy
-#| msgid ""
-#| "template-file and config-script are written to the temporary directory "
-#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
-#| "TempDir</literal>) directory, with filenames of the form "
-#| "<filename>package.template.XXXX</filename> and <filename>package.config."
-#| "XXXX</filename>"
msgid ""
"template-file and config-script are written to the temporary directory "
"specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -2014,8 +1975,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "La section Dir"
+msgid "<literal>Dir</literal> Section"
+msgstr "La section <literal>Dir</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:146
@@ -2062,8 +2023,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr "La section Default"
+msgid "<literal>Default</literal> Section"
+msgstr "La section <literal>Default</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:178
@@ -2166,8 +2127,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr "La section TreeDefault"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "La section <literal>TreeDefault</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:244
@@ -2321,8 +2282,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr "La section Tree"
+msgid "<literal>Tree</literal> Section"
+msgstr "La section <literal>Tree</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:344
@@ -2439,8 +2400,8 @@ msgstr "Indique un autre fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr "La section BinDirectory"
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "La section <literal>BinDirectory</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:412
@@ -2745,7 +2706,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr "Exemples"
@@ -2889,7 +2850,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2901,7 +2862,7 @@ msgid ""
msgstr ""
"La commande <literal>install</literal> est suivie par un ou plusieurs "
"paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas un "
-"nom complet de fichier (par exemple, dans un système Debian GNU/Linux, on "
+"nom complet de fichier (par exemple, dans un système Debian, on "
"indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les "
"paquets requis par le(s) paquet(s) que l'on veut installer sont aussi "
"récupérés et installés. Le fichier <filename>/etc/apt/sources.list</"
@@ -3125,10 +3086,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:210
-#, fuzzy
-#| msgid ""
-#| "<literal>download</literal> will download the given binary package into "
-#| "the current directory."
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
@@ -3192,16 +3149,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:241
-#, fuzzy
-#| msgid ""
-#| "<literal>changelog</literal> downloads a package changelog and displays "
-#| "it through <command>sensible-pager</command>. The server name and base "
-#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-#| "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-#| "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-#| "Ubuntu). By default it displays the changelog for the version that is "
-#| "installed. However, you can specify the same options as for the "
-#| "<option>install</option> command."
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3216,9 +3163,10 @@ msgstr ""
"<literal>changelog</literal> télécharge le journal des modifications d'un "
"paquet et l'affiche avec <command>sensible-pager</command>. Le nom du "
"serveur et le répertoire de base sont définis dans la variable <literal>APT::"
-"Changelogs::Server</literal> (p. ex. <ulink>http://packages.debian.org/"
-"changelogs</ulink> pour Debian ou <ulink>http://changelogs.ubuntu.com/"
-"changelogs</ulink> pour Ubuntu). Par défaut, c'est le journal des "
+"Changelogs::Server</literal> (p. ex. <ulink url=\"http://packages.debian.org/"
+"changelogs\">http://packages.debian.org/changelogs</ulink> pour Debian ou "
+"<ulink url=\"http://changelogs.ubuntu.com/changelogs\">http://changelogs."
+"ubuntu.com/changelogs</ulink> pour Ubuntu). Par défaut, c'est le journal des "
"modifications de la version installée du paquet qui est affiché. Cependant, "
"il est possible d'utiliser les mêmes options que pour la commande "
"<option>install</option>."
@@ -3394,16 +3342,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:354
-#, fuzzy
-#| msgid ""
-#| "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
-#| "SourceList</literal>."
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
msgstr ""
-"Emplacements où aller chercher les paquets. Élément de configuration : "
-"<literal>Dir::Etc::SourceList</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
@@ -3683,15 +3625,6 @@ msgstr ""
"outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
"AllowUnauthenticated</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-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:530
msgid ""
@@ -3755,10 +3688,8 @@ msgstr "Supprimer une clé de la liste des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:74
-#, fuzzy
-#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgid "Output the key &synopsis-param-keyid; to standard output."
-msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard."
+msgstr "Afficher la clé &synopsis-param-keyid; sur la sortie standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:85
@@ -3816,14 +3747,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:164
-#, fuzzy
-#| msgid ""
-#| "With this option it is possible to specify a specific keyring file the "
-#| "command should operate on. The default is that a command is executed on "
-#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#| "added to this one."
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3839,11 +3762,6 @@ msgstr ""
"gpg</filename> reste le fichier principal pour les clés donc, par exemple, "
"les nouvelles clés y seront ajoutées."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -3964,16 +3882,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
msgid ""
"<literal>unhold</literal> is used to cancel a previously set hold on a "
"package to allow all actions again."
msgstr ""
-"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
-"un paquet par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:84
@@ -4000,23 +3912,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
msgid ""
"<literal>showhold</literal> is used to print a list of packages on hold in "
"the same way as for the other show commands."
msgstr ""
-"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
-"un paquet par ligne."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr "xvcg <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
@@ -4028,28 +3927,17 @@ msgstr "xvcg <replaceable>paquet(s)</replaceable>"
#| "Configuration Item: <literal>Dir::State</literal>."
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Lecture/écriture des statistiques d'un paquet dans "
"<filename><replaceable>FICHIER</replaceable></filename> au lieu du fichier "
"par défaut (<filename>extended_status</filename> dans le répertoire défini "
"par l'élément de configuration <literal>Dir::State</literal>)."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr " &file-extended_states;"
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4337,14 +4225,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:198
-#, fuzzy
-#| msgid ""
-#| "For more background information you might want to review the <ulink url="
-#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
-#| "Manual (available also in the harden-doc package) and the <ulink url="
-#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-#| "Distribution HOWTO</ulink> by V. Alex Brennen."
msgid ""
"For more background information you might want to review the <ulink url="
"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -4354,7 +4234,7 @@ msgid ""
"ulink> by V. Alex Brennen."
msgstr ""
"Pour des informations plus complètes, vous pouvez consulter <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\"> "
+"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\"> "
"l'infrastructure debian pour la sécurité</ulink> un chapitre du manuel "
"Debian sur la sécurité (disponible dans le paquet harden-doc) et le <ulink "
"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\">Strong "
@@ -4472,15 +4352,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:51
-#, fuzzy
-#| msgid ""
-#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-#| "order which have no or \"<literal>conf</literal>\" as filename extension "
-#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
-#| "period (.) characters. Otherwise APT will print a notice that it has "
-#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
-#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
-#| "be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
"order which have either no or \"<literal>conf</literal>\" as filename "
@@ -5003,6 +4874,15 @@ msgstr ""
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"Le groupe d'options <literal>Acquire</literal> contrôle le téléchargement "
+"des paquets et les gestionnaires d'URI."
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -5547,12 +5427,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:469
-#, fuzzy
-#| msgid ""
-#| "The special type <literal>uncompressed</literal> can be used to give "
-#| "uncompressed files a preference, but note that most archives don't "
-#| "provide uncompressed files so this is mostly only useable for local "
-#| "mirrors."
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -5657,16 +5531,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Le groupe d'options <literal>Acquire</literal> contrôle le téléchargement "
-"des paquets et les gestionnaires d'URI. <placeholder type=\"variablelist\" "
-"id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -6544,11 +6408,6 @@ msgstr ""
"Le fichier &configureindex; contient un modèle de fichier montrant des "
"exemples pour toutes les options existantes."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -6705,6 +6564,15 @@ msgstr ""
"<filename>/etc/apt/apt.conf</filename>. Par exemple : <placeholder type="
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+"Quand une distribution par défaut a été indiquée, APT utilise l'algorithme "
+"suivant pour déterminer la priorité des versions d'un paquet :"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
msgid "priority 1"
@@ -6777,17 +6645,6 @@ msgstr ""
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Quand une distribution par défaut a été indiquée, APT utilise l'algorithme "
-"suivant pour déterminer la priorité des versions d'un paquet : <placeholder "
-"type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
#, fuzzy
#| msgid ""
@@ -7119,19 +6976,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
"Pin: release n=experimental\n"
"Pin-Priority: 500\n"
msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:279
@@ -7143,19 +6996,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=karmic*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:291
@@ -7173,6 +7022,15 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+"Les priorités (P) indiquées dans le fichier des préférences doivent être des "
+"entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit :"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -7253,17 +7111,6 @@ msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Les priorités (P) indiquées dans le fichier des préférences doivent être des "
-"entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit : "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -7374,6 +7221,25 @@ msgstr ""
"fichiers <filename>Packages</filename> et <filename>Release</filename> qui "
"décrivent les paquets disponibles à cet endroit."
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"Le fichier <filename>Packages</filename> se trouve normalement dans le "
+"répertoire <filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>, par exemple, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. Il consiste en entrées composées de lignes, une pour "
+"chaque paquet disponible dans le répertoire. Seules deux lignes des entrées "
+"sont pertinentes pour la détermination des priorités :"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -7395,25 +7261,26 @@ msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
-"Le fichier <filename>Packages</filename> se trouve normalement dans le "
-"répertoire <filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>, par exemple, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. Il consiste en entrées composées de lignes, une pour "
-"chaque paquet disponible dans le répertoire. Seules deux lignes des entrées "
-"sont pertinentes pour la détermination des priorités : <placeholder type="
-"\"variablelist\" id=\"0\"/>"
+"Le fichier <filename>Release</filename> se trouve normalement dans le "
+"répertoire <filename>.../dists/<replaceable>nom-distribution</replaceable></"
+"filename>, par exemple, <filename>.../dists/stable/Release</filename>, ou "
+"<filename>.../dists/&stable-codename;/Release</filename>. Il consiste en "
+"une seule entrée composée de plusieurs lignes qui s'applique à "
+"<emphasis>tous</emphasis> les paquets situés dans les répertoires sous le "
+"répertoire parent. Contrairement au fichier <filename>Packages</filename>, "
+"presque toutes les lignes du fichier <filename>Release</filename> sont "
+"pertinentes pour déterminer les priorités :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:428
@@ -7476,13 +7343,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"indique la version de la distribution. Par exemple, les paquets dans les "
-"répertoires peuvent appartenir à la distribution Debian GNU/Linux version "
+"répertoires peuvent appartenir à la distribution Debian version "
"3.0. Il n'y a pas de numéro de version pour les distributions "
"<literal>testing</literal> et <literal>unstable</literal> car elles n'ont "
"pas encore été publiées. Indiquer cette valeur dans le fichier des "
@@ -7578,30 +7445,6 @@ msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"Le fichier <filename>Release</filename> se trouve normalement dans le "
-"répertoire <filename>.../dists/<replaceable>nom-distribution</replaceable></"
-"filename>, par exemple, <filename>.../dists/stable/Release</filename>, ou "
-"<filename>.../dists/&stable-codename;/Release</filename>. Il consiste en "
-"une seule entrée composée de plusieurs lignes qui s'applique à "
-"<emphasis>tous</emphasis> les paquets situés dans les répertoires sous le "
-"répertoire parent. Contrairement au fichier <filename>Packages</filename>, "
-"presque toutes les lignes du fichier <filename>Release</filename> sont "
-"pertinentes pour déterminer les priorités : <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7920,11 +7763,6 @@ msgstr ""
"<literal>sid</literal> si elle est plus récente que la version installée. "
"<placeholder type=\"programlisting\" id=\"0\"/>"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7940,7 +7778,7 @@ msgstr "Liste des sources de paquets"
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. "
+"documents only the packaging system used by the Debian system. "
"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 "
@@ -8178,13 +8016,15 @@ msgstr ""
msgid "URI specification"
msgstr "Spécification des URI"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "plus de types d'URI simples à reconnaître"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8194,13 +8034,8 @@ msgstr ""
"sein du système de fichier soit considéré comme une archive. On s'en sert "
"avec les montages NFS, les miroirs et les archives locaux."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8209,13 +8044,8 @@ msgstr ""
"avec la possibilité de changer de media. Utilisez le programme &apt-cdrom; "
"pour créer des entrées dans la liste des sources."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -8231,13 +8061,8 @@ msgstr ""
"authentification, on peut utiliser la chaîne http://user:pass@server:port/. "
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8256,13 +8081,8 @@ msgstr ""
"cette méthode et SEULEMENT cette méthode. Les mandataires ftp utilisant http "
"et qui sont spécifiés dans le fichier de configuration seront ignorés."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8273,18 +8093,8 @@ msgstr ""
"lieu d'être utilisés directement depuis leur emplacement. C'est utile aux "
"gens qui utilisent un disque zip pour recopier des fichiers avec APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8299,21 +8109,22 @@ msgstr ""
"commandes standard <command>find</command> et <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
msgstr "plus de types d'URI simples à reconnaître"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
"APT peut être complété avec des méthodes supplémentaires fournies par des "
"paquets optionnels dont le schéma de nommage est <literal>apt-transport-"
@@ -8321,21 +8132,10 @@ msgstr ""
"maintenance d'APT gère un paquet <literal>apt-transport-https</literal> qui "
"gère les accès par URI de type https, avec des fonctionnalités analogues à "
"la méthode http. D'autres méthodes telles que debtorrent sont aussi "
-"disponibles (voir <citerefentry> <refentrytitle><filename>apt-transport-"
-"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
-"citerefentry>)."
+"disponibles (voir &apt-transport-debtorrent;)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Les types d'URI actuellement reconnus sont : cdrom, file, http, ftp, copy, "
-"ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8344,37 +8144,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
#, 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:219
+#: sources.list.5.xml:216
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:220
+#: sources.list.5.xml:217
#, 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:222
+#: sources.list.5.xml:219
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:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8382,22 +8182,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-#| " "
+#: sources.list.5.xml:224
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8406,13 +8201,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
#, 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:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -8421,13 +8216,13 @@ msgstr ""
"répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -8440,19 +8235,19 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, 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><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8472,7 +8267,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -8520,7 +8315,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
"Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
@@ -10058,141 +9853,6 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 août 2009</date>"
-
-#~ msgid "ORIGINAL AUTHORS"
-#~ msgstr "AUTEURS D'ORIGINE"
-
-#~ msgid "&apt-author.jgunthorpe;"
-#~ msgstr "&apt-author.jgunthorpe;"
-
-#~ msgid "CURRENT AUTHORS"
-#~ msgstr "AUTEURS ACTUELS"
-
-#~ msgid "&apt-author.team;"
-#~ msgstr "&apt-author.team;"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 août 2009</date>"
-
-#, 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>16 January 2010</date>"
-#~ 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;"
-#~ 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>16 janvier 2010</date>"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-#~ msgid "&apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
-
-#~ msgid ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 October 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-#~ msgstr ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 Octobre 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>04 February 2011</date>"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>2012-05-21T05:49:00+01:00</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>4 février 2011</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 février 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 février 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 août 2009</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 November 2008</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 Novembre 2008</date>"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>9 August 2009</date>"
-#~ msgid ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>21 April 2011</date>"
-#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#~ "août 2009</date>"
-
#~ msgid ""
#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
#~ "get check</command>. It builds the source and package caches from the "
@@ -10222,15 +9882,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ "Dans le cas contraire, des données seront corrompues. Les machines qui "
#~ "ont besoin de cette option ne respectent pas la RFC 2068."
-#~ msgid "add <replaceable>filename</replaceable>"
-#~ msgstr "add <replaceable>fichier</replaceable>"
-
-#~ msgid "del <replaceable>keyid</replaceable>"
-#~ msgstr "del <replaceable>clé</replaceable>"
-
-#~ msgid "export <replaceable>keyid</replaceable>"
-#~ msgstr "export <replaceable>clé</replaceable>"
-
#~ msgid ""
#~ "Update the local keyring with the keyring of Debian archive keys and "
#~ "removes from the keyring the archive keys which are no longer valid."
@@ -10384,9 +10035,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ "les informations sur les paquets disponibles. Cette option fixe la taille "
#~ "mémoire allouée (en octets) pour le chargement de ce cache."
-#~ msgid "Pin: release n=squeeze\n"
-#~ msgstr "Pin: release n=squeeze\n"
-
#~ msgid ""
#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
@@ -10398,9 +10046,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ "valeur spécifiée sur une ligne commençant par <literal>Pin-Priority: "
#~ "release ...</literal>."
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
-
#~ 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."
@@ -10442,21 +10087,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ "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>"
-
-#~ msgid "<filename>&statedir;/lists/</filename>"
-#~ msgstr "<filename>&statedir;/lists/</filename>"
-
-#~ msgid "<filename>&statedir;/lists/partial/</filename>"
-#~ msgstr "<filename>&statedir;/lists/partial/</filename>"
-
-#~ msgid "<filename>/etc/apt/apt.conf</filename>"
-#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-
-#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
-#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
-
#~ msgid ""
#~ "APT configuration file fragments. Configuration Item: <literal>Dir::Etc::"
#~ "Parts</literal>."
@@ -10464,15 +10094,9 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ "Éléments du fichier de configuration d'APT. Élément de configuration : "
#~ "<literal>Dir::Etc::Parts</literal>."
-#~ msgid "<filename>&cachedir;/archives/</filename>"
-#~ msgstr "<filename>&cachedir;/archives/</filename>"
-
#~ msgid ""
#~ "Storage area for retrieved package files. Configuration Item: "
#~ "<literal>Dir::Cache::Archives</literal>."
#~ msgstr ""
#~ "Zone de stockage pour les paquets récupérés. Élément de configuration : "
#~ "<literal>Dir::Cache::Archives</literal>."
-
-#~ msgid "<filename>&cachedir;/archives/partial/</filename>"
-#~ msgstr "<filename>&cachedir;/archives/partial/</filename>"
diff --git a/doc/po/it.po b/doc/po/it.po
index 5769747bc..8c2ee778e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\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"
@@ -34,7 +34,7 @@ msgstr ""
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
+msgid "Debian"
msgstr ""
#. type: SH
@@ -297,7 +297,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -603,7 +603,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -618,8 +619,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -694,7 +695,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -704,7 +705,7 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
@@ -713,7 +714,7 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
@@ -789,45 +790,43 @@ msgstr ""
#: apt-cache.8.xml:170
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -837,7 +836,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -845,7 +844,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -858,7 +857,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -867,24 +866,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -893,7 +892,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -905,14 +904,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -920,7 +919,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -930,7 +929,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -939,7 +938,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -947,7 +946,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -957,14 +956,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -975,7 +974,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -983,14 +982,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -998,7 +997,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1006,54 +1005,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
"<literal>APT::Cache::Installed</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1081,7 +1068,7 @@ msgid ""
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1091,7 +1078,7 @@ msgid ""
"title."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1099,28 +1086,20 @@ msgid ""
"filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1128,7 +1107,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1136,7 +1115,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1144,7 +1123,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1153,7 +1132,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1161,7 +1140,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1169,12 +1148,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1194,13 +1173,6 @@ msgid ""
"manner that is easy to use by scripted applications."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -1473,7 +1445,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
+msgid "<literal>Dir</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1512,7 +1484,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
+msgid "<literal>Default</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1591,7 +1563,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
+msgid "<literal>TreeDefault</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1705,7 +1677,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
+msgid "<literal>Tree</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1795,7 +1767,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2013,7 +1985,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr ""
@@ -2110,7 +2082,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2605,13 +2577,6 @@ msgid ""
"AllowUnauthenticated</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:530
msgid ""
@@ -2724,11 +2689,6 @@ msgid ""
"this one."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -2844,33 +2804,17 @@ msgid ""
"the same way as for the other show commands."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -3483,6 +3427,13 @@ msgstr ""
msgid "The Acquire Group"
msgstr ""
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -3871,13 +3822,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -4463,11 +4407,6 @@ msgid ""
"possible options."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr ""
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -4571,6 +4510,13 @@ msgid ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
msgid "priority 1"
@@ -4623,14 +4569,6 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -4905,6 +4843,13 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -4976,14 +4921,6 @@ msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -5061,6 +4998,18 @@ msgid ""
"describe the packages available at that location."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -5082,16 +5031,16 @@ msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -5142,7 +5091,7 @@ msgstr ""
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
@@ -5220,20 +5169,6 @@ msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -5452,11 +5387,6 @@ msgid ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5472,7 +5402,7 @@ msgstr ""
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
@@ -5639,38 +5569,28 @@ msgstr ""
msgid "URI specification"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
"archives."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -5680,13 +5600,8 @@ msgid ""
"authentication."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -5697,31 +5612,16 @@ msgid ""
"ignored."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using a zip disk to copy files around with APT."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -5731,67 +5631,59 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
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:217
+#: sources.list.5.xml:214
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5799,7 +5691,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5807,33 +5699,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
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:232
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -5842,19 +5734,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -5866,7 +5758,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr ""
@@ -5919,10 +5811,10 @@ msgstr ""
#: guide.sgml:24 offline.sgml:25
#, fuzzy
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"Per ulteriori dettagli sui sistemi GNU/Linux si veda il testo completo della "
+"Per ulteriori dettagli sui sistemi si veda il testo completo della "
"licenza nel file /usr/share/common-licenses/GPL."
#. type: <heading></heading>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index a040ee8e9..885e52608 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\n"
"PO-Revision-Date: 2010-09-07 07:38+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -33,8 +33,8 @@ msgstr "16 June 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
# type: SH
#. type: SH
@@ -419,7 +419,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -532,7 +532,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -818,7 +818,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -835,8 +836,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -951,13 +952,13 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
"<literal>純粋仮想パッケージ</literal>は、仮想パッケージ名としてのみ存在する"
"パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ"
-"の名称を持たない) の数を表します。例えば、Debian GNU/Linux システムでは "
+"の名称を持たない) の数を表します。例えば、Debian システムでは "
"\"mail-transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" "
"を提供するパッケージはいくつもありますが、\"mail-transport-agent\" という名称"
"のパッケージはありません。"
@@ -968,11 +969,11 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>単一仮想パッケージ</literal>は、特定の仮想パッケージ名を提供するパッ"
-"ケージが、ただ一つの場合の数を表します。例えば、Debian GNU/Linux システムで"
+"ケージが、ただ一つの場合の数を表します。例えば、Debian システムで"
"は、\"X11-text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供す"
"るパッケージは、xless パッケージのみということです。"
@@ -982,12 +983,12 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>複合仮想パッケージ</literal>は、その仮想パッケージ名を提供するパッ"
"ケージが複数あるか、またパッケージ名と同じ仮想パッケージ名を持つパッケージ数"
-"を表します。例えば、Debian GNU/Linux システムでは、debconf は実際のパッケージ"
+"を表します。例えば、Debian システムでは、debconf は実際のパッケージ"
"名でもありますが、debconf-tiny によって提供もされています。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -1091,17 +1092,27 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>. It searches the package names "
+#| "and the descriptions for an occurrence of the regular expression and "
+#| "prints out the package name and the short description, including virtual "
+#| "package names. If <option>--full</option> is given then output identical "
+#| "to <literal>show</literal> is produced for each matched package, and if "
+#| "<option>--names-only</option> is given then the long description is not "
+#| "searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
"<literal>search</literal> は、与えられた POSIX の正規表現 "
"(<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
@@ -1115,7 +1126,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1123,7 +1134,7 @@ msgstr "空白で区切った引数で、複数の検索パターンの and を
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1133,7 +1144,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1142,15 +1153,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
-#, fuzzy
-#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
-msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -1164,7 +1173,7 @@ msgstr ""
"generate</option> オプションと共に使用すると非常に便利です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -1176,7 +1185,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1196,7 +1205,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1210,12 +1219,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1225,15 +1234,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
-msgstr "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1246,7 +1253,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1265,7 +1272,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
@@ -1273,7 +1280,7 @@ msgstr "オプション"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1285,7 +1292,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1301,7 +1308,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1315,7 +1322,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1327,7 +1334,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
#, fuzzy
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
@@ -1342,7 +1349,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1352,7 +1359,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1369,7 +1376,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1382,7 +1389,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1392,7 +1399,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1403,7 +1410,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1415,7 +1422,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1425,53 +1432,40 @@ msgstr ""
"ストールされているパッケージに限定します。設定項目 - <literal>APT::Cache::"
"Installed</literal>"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "ファイル"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr "関連項目"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "診断メッセージ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1511,7 +1505,7 @@ msgstr ""
"command> が必要になります。その上、CD セットのディスクを 1 枚づつ、焼き損じを"
"補正できるか評価しなければなりません。"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1526,7 +1520,7 @@ msgstr ""
"filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1538,7 +1532,7 @@ msgstr ""
"ベースで管理します。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
@@ -1547,26 +1541,15 @@ msgstr ""
"格納されているファイル名と現在のディスクが同一かどうかをレポートする、デバッ"
"グツールです。"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
-"下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id=\"0\"/>"
-
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr "オプション"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1578,7 +1561,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1590,7 +1573,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1602,7 +1585,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1616,7 +1599,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1629,7 +1612,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1641,13 +1624,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1675,16 +1658,6 @@ msgstr ""
"で、メイン設定ファイル <filename>/etc/apt/apt.conf</filename> にアクセスしま"
"す。"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
-"下に挙げるコマンドが必要です。"
-
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
@@ -2067,11 +2040,12 @@ msgstr ""
"generate 設定には 4 個の独立したセクションがあります。以下それぞれ説明しま"
"す。"
-# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "Dir セクション"
+#, fuzzy
+#| msgid "the <literal>Origin:</literal> line"
+msgid "<literal>Dir</literal> Section"
+msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2119,11 +2093,12 @@ msgstr ""
"<literal>FileList</literal> 設定が以下で使用されている場合、ファイルリスト"
"ファイルの場所を指定します。"
-# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr "Default セクション"
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Default</literal> Section"
+msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2228,11 +2203,12 @@ msgid ""
"out into a master Translation-en file."
msgstr ""
-# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr "TreeDefault セクション"
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2388,11 +2364,12 @@ msgstr ""
"み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
"トリが先頭につきます。ソースインデックスを処理する際に使用します。"
-# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr "Tree セクション"
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Tree</literal> Section"
+msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2518,7 +2495,9 @@ msgstr "ソース特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
+#, fuzzy
+#| msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
msgstr "BinDirectory セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
@@ -2828,7 +2807,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr "サンプル"
@@ -2938,7 +2917,7 @@ msgid ""
"realize that state (for instance, the removal of old and the installation of "
"new packages)."
msgstr ""
-"<literal>dselect-upgrade</literal> は、伝統的な Debian GNU/Linux パッケージ管"
+"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管"
"理フロントエンドの &dselect; と共に使用されます。<literal>dselect-upgrade</"
"literal> は、&dselect; で作られた利用可能パッケージの<literal>Status</"
"literal> フィールドの変更を追跡し、その状態を反映させるのに必要なアクションを"
@@ -2975,7 +2954,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2987,7 +2966,7 @@ msgid ""
msgstr ""
"<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指"
"定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例"
-"えば Debian GNU/Linux システムでは、<literal>libc6_1.9.6-2.deb</literal> では"
+"えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> では"
"なく libc6 を引数として与えます)。インストールするよう指定したすべてのパッ"
"ケージに対し、取得・インストールを行います。<filename>/etc/apt/sources.list</"
"filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
@@ -3738,15 +3717,6 @@ msgstr ""
"うなツールで便利です。設定項目 - <literal>APT::Get::AllowUnauthenticated</"
"literal>"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-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>
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:530
@@ -3819,10 +3789,8 @@ msgstr "信頼キー一覧からキーを削除します。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:74
-#, fuzzy
-#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgid "Output the key &synopsis-param-keyid; to standard output."
-msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。"
+msgstr "キー &synopsis-param-keyid; を標準出力に出力します。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3905,11 +3873,6 @@ msgstr ""
"gpg</filename> がプライマリキーリングです。つまり新しいキーはこのファイルに追"
"加されます。"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
@@ -4089,14 +4052,6 @@ msgstr ""
"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
"ケージごとに改行して表示します。"
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr "xvcg <replaceable>pkg(s)</replaceable>"
-
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
@@ -4108,29 +4063,17 @@ msgstr "xvcg <replaceable>pkg(s)</replaceable>"
#| "Configuration Item: <literal>Dir::State</literal>."
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
"トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
"filename> からパッケージの統計を読み書きします。"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr " &file-extended_states;"
-
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4449,14 +4392,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:198
-#, fuzzy
-#| msgid ""
-#| "For more background information you might want to review the <ulink url="
-#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
-#| "Manual (available also in the harden-doc package) and the <ulink url="
-#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-#| "Distribution HOWTO</ulink> by V. Alex Brennen."
msgid ""
"For more background information you might want to review the <ulink url="
"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -4467,9 +4402,9 @@ msgid ""
msgstr ""
"詳細な背景情報を検証するのなら、Securing Debian Manual (harden-doc パッケージ"
"にも収録) の <ulink url=\"http://www.debian.org/doc/manuals/securing-debian-"
-"howto/ch7.en.html\">Debian Security Infrastructure</ulink> 章や、V. Alex "
-"Brennen による <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro."
-"html\" >Strong Distribution HOWTO</ulink> をご覧ください。"
+"howto/ch7\">Debian Security Infrastructure</ulink> 章や、V. Alex Brennen によ"
+"る <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" "
+">Strong Distribution HOWTO</ulink> をご覧ください。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
@@ -5055,6 +4990,22 @@ msgstr ""
msgid "The Acquire Group"
msgstr "Acquire グループ"
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers. <placeholder type=\"variablelist\" id="
+#| "\"0\"/>"
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード"
+"や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/"
+">"
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -5603,17 +5554,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード"
-"や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/"
-">"
-
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
@@ -6361,12 +6301,6 @@ msgstr ""
"イルのサンプルがあります。"
# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
-# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -6519,6 +6453,22 @@ msgstr ""
"に注意してください。例えば以下のようになります。<placeholder type="
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+# type: Content of: <refentry><refsect1><refsect2><para>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+#, fuzzy
+#| msgid ""
+#| "If the target release has been specified then APT uses the following "
+#| "algorithm to set the priorities of the versions of a package. Assign: "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+"ターゲットリリースが指定されると、APT は以下のアルゴリズムで、パッケージの"
+"バージョンの優先度を設定します。以下のように割り当てます。<placeholder type="
+"\"variablelist\" id=\"0\"/>"
+
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
@@ -6578,18 +6528,6 @@ msgstr "インストールされておらず、ターゲットリリースに含
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"ターゲットリリースが指定されると、APT は以下のアルゴリズムで、パッケージの"
-"バージョンの優先度を設定します。以下のように割り当てます。<placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
#, fuzzy
msgid ""
@@ -6930,20 +6868,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
"Pin: release n=experimental\n"
"Pin-Priority: 500\n"
msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-"\n"
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:279
@@ -6956,20 +6889,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=karmic*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-"\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:291
@@ -6988,6 +6916,22 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
+# type: Content of: <refentry><refsect1><refsect2><para>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Priorities (P) assigned in the APT preferences file must be positive or "
+#| "negative integers. They are interpreted as follows (roughly speaking): "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+"APT 選択ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ"
+"れは (おおざっぱにいうと) 以下のように解釈されます。<placeholder type="
+"\"variablelist\" id=\"0\"/>"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -7076,18 +7020,6 @@ msgstr "このバージョンのインストール禁止"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"APT 選択ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ"
-"れは (おおざっぱにいうと) 以下のように解釈されます。<placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -7205,6 +7137,36 @@ msgstr ""
"述した、<filename>Packages</filename> ファイルや <filename>Release</"
"filename> ファイルを提供します。"
+# type: Content of: <refentry><refsect1><refsect2><para>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+#, fuzzy
+#| msgid ""
+#| "The <filename>Packages</filename> file is normally found in the directory "
+#| "<filename>.../dists/<replaceable>dist-name</replaceable>/"
+#| "<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+#| "filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+#| "Packages</filename>. It consists of a series of multi-line records, one "
+#| "for each package available in that directory. Only two lines in each "
+#| "record are relevant for setting APT priorities: <placeholder type="
+#| "\"variablelist\" id=\"0\"/>"
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"<filename>Packages</filename> ファイルは通常 <filename>.../dists/"
+"<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/"
+"<replaceable>arch</replaceable></filename> ディレクトリにあります。例えば、"
+"<filename>.../dists/stable/main/binary-i386/Packages</filename> です。これ"
+"は、ディレクトリにある利用可能パッケージごとに、複数行のレコードからできてい"
+"ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。<placeholder "
+"type=\"variablelist\" id=\"0\"/>"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -7229,24 +7191,26 @@ msgstr "その名前のパッケージのバージョン番号"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
+#, fuzzy
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
-"<filename>Packages</filename> ファイルは通常 <filename>.../dists/"
-"<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/"
-"<replaceable>arch</replaceable></filename> ディレクトリにあります。例えば、"
-"<filename>.../dists/stable/main/binary-i386/Packages</filename> です。これ"
-"は、ディレクトリにある利用可能パッケージごとに、複数行のレコードからできてい"
-"ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。<placeholder "
-"type=\"variablelist\" id=\"0\"/>"
+"<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
+"<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え"
+"ば、 <filename>.../dists/stable/Release</filename>, <filename>.../dists/"
+"woody/Release</filename> です。これは、このディレクトリ以下にある<emphasis>全"
+"</emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。"
+"<filename>Packages</filename> ファイルと違い <filename>Release</filename> "
+"ファイルは、以下のようにほとんどの行が APT 優先度の設定に関連します。"
+"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:428
@@ -7312,7 +7276,7 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
@@ -7423,30 +7387,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-#, fuzzy
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
-"<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え"
-"ば、 <filename>.../dists/stable/Release</filename>, <filename>.../dists/"
-"woody/Release</filename> です。これは、このディレクトリ以下にある<emphasis>全"
-"</emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。"
-"<filename>Packages</filename> ファイルと違い <filename>Release</filename> "
-"ファイルは、以下のようにほとんどの行が APT 優先度の設定に関連します。"
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7780,12 +7720,6 @@ msgstr ""
"literal> バージョンのパッケージが更新されていれば <literal>sid</literal>の最"
"新版にアップグレードします。<placeholder type=\"programlisting\" id=\"0\"/>"
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
@@ -7804,11 +7738,11 @@ msgstr "APT 用パッケージリソースリスト"
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
-"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム"
+"するのに使用されます。今回このマニュアルページには、Debian システム"
"で使用するパッケージシステムについてのみ記述します。この制御ファイルは、"
"<filename>/etc/apt/sources.list</filename> にあります。"
@@ -8062,15 +7996,16 @@ msgstr ""
msgid "URI specification"
msgstr "URI の仕様"
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "ファイル"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "さらに認識できる URI タイプ"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8079,15 +8014,9 @@ msgstr ""
"file スキームは、システム内の任意のディレクトリを、アーカイブとして扱えるよう"
"にします。これは NFS マウントやローカルミラーで便利です。"
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8096,15 +8025,9 @@ msgstr ""
"るようにします。取得元リストに cdrom エントリを追加するには、&apt-cdrom; プロ"
"グラムを使用してください。"
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -8119,15 +8042,9 @@ msgstr ""
"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
"指定してください。この認証方法は安全ではないことに注意してください。"
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8145,14 +8062,9 @@ msgstr ""
"イルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視さ"
"れます。"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8162,19 +8074,9 @@ msgstr ""
"キャッシュディレクトリにコピーするところが違います。zip ディスクを使用してい"
"て、APT でコピーを行う場合に便利です。"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8189,36 +8091,27 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
msgstr "さらに認識できる URI タイプ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
-"現在認識する URI タイプは、cdrom, file, http, ftp, copy, ssh, rsh です。"
-"<placeholder type=\"variablelist\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8227,37 +8120,37 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
#, 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:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, 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:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr "上記のソース行"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8265,23 +8158,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-#| " "
+#: sources.list.5.xml:224
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8291,14 +8179,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
#, 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:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -8308,14 +8196,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -8329,21 +8217,20 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, 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><literallayout>
-#: sources.list.5.xml:251
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#: sources.list.5.xml:248
+#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -8372,7 +8259,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -8420,10 +8307,10 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
#. type: <heading></heading>
@@ -9584,140 +9471,110 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&apt-commonoptions;"
+#~ msgstr "&apt-commonoptions;"
+
+#~ msgid "&file-sourceslist; &file-statelists;"
+#~ msgstr "&file-sourceslist; &file-statelists;"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present. <placeholder type="
+#~ "\"variablelist\" id=\"0\"/>"
#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
+#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
+#~ "き、以下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id="
+#~ "\"0\"/>"
-#~ msgid "ORIGINAL AUTHORS"
-#~ msgstr "原著者"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present."
+#~ msgstr ""
+#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
+#~ "き、以下に挙げるコマンドが必要です。"
-#~ msgid "&apt-author.jgunthorpe;"
-#~ msgstr "&apt-author.jgunthorpe;"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Dir Section"
+#~ msgstr "Dir セクション"
-#~ msgid "CURRENT AUTHORS"
-#~ msgstr "現著者"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Default Section"
+#~ msgstr "Default セクション"
-#~ msgid "&apt-author.team;"
-#~ msgstr "&apt-author.team;"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "TreeDefault Section"
+#~ msgstr "TreeDefault セクション"
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Tree Section"
+#~ msgstr "Tree セクション"
-#, 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>16 January 2010</date>"
#~ 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;"
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#~ "firstname> <surname>Burrows</surname> <contrib>Debug::*. の最初のドキュメ"
-#~ "ント</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-#~ "&apt-product; <date>16 January 2010</date>"
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
+
+#~ msgid "&file-trustedgpg;"
+#~ msgstr "&file-trustedgpg;"
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#, fuzzy
-#~| msgid ""
-#~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-#~ msgid "&apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+#~| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
+#~ msgstr "<replaceable>&synopsis-filename;</replaceable>"
-#~ msgid ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 October 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-#~ msgstr ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 October 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
+#~ msgid " &file-extended_states;"
+#~ msgstr " &file-extended_states;"
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>14 February 2004</date>"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>2012-05-21T05:49:00+01:00</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
+#~ msgstr "&apt-get;,&aptitude;,&apt-conf;"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&file-aptconf;"
+#~ msgstr "&file-aptconf;"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 February 2004</date>"
+# type: Content of: <refentry><refnamediv><refname>
+#~ msgid "&file-preferences;"
+#~ msgstr "&file-preferences;"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
+# type: Content of: <refentry><refsect1><title>
+#~ msgid "file"
+#~ msgstr "ファイル"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 November 2008</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 November 2008</date>"
+# type: Content of: <refentry><refnamediv><refname>
+#~ msgid "cdrom"
+#~ msgstr "cdrom"
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>9 August 2009</date>"
+# type: <tag></tag>
+#~ msgid "http"
+#~ msgstr "http"
+
+# type: <tag></tag>
+#~ msgid "ftp"
+#~ msgstr "ftp"
+
+#~ msgid "copy"
+#~ msgstr "copy"
+
+#~ msgid "rsh"
+#~ msgstr "rsh"
+
+#~ msgid "ssh"
+#~ msgstr "ssh"
+
+# type: Content of: <refentry><refsect1><para>
#~ msgid ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>21 April 2011</date>"
+#~ "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
+#~ "rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#~ "August 2009</date>"
+#~ "現在認識する URI タイプは、cdrom, file, http, ftp, copy, ssh, rsh です。"
+#~ "<placeholder type=\"variablelist\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#~ msgid ""
@@ -9748,18 +9605,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
#~ "なければなりません。そうでなければデータが破損してしまいます。これが必要な"
#~ "ホストは RFC 2068 に違反しています。"
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#~ msgid "add <replaceable>filename</replaceable>"
-#~ msgstr "add <replaceable>filename</replaceable>"
-
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#~ msgid "del <replaceable>keyid</replaceable>"
-#~ msgstr "del <replaceable>keyid</replaceable>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid "export <replaceable>keyid</replaceable>"
-#~ msgstr "export <replaceable>keyid</replaceable>"
-
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#~ msgid ""
#~ "Update the local keyring with the keyring of Debian archive keys and "
@@ -9768,10 +9613,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
#~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
#~ "キーリングから削除します。"
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#~ msgid "--keyring <replaceable>filename</replaceable>"
-#~ msgstr "--keyring <replaceable>filename</replaceable>"
-
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#~ msgid ""
#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
@@ -9852,13 +9693,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
#~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト"
#~ "リ以下を使用します。"
-#~ 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: SH
#~ msgid "OPTIONS"
#~ msgstr "オプション"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 9489792c2..559f63cfc 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\n"
"PO-Revision-Date: 2010-03-18 22:00+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -35,8 +35,8 @@ msgstr "16 czerwca 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -425,7 +425,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -815,7 +815,8 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -832,8 +833,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -948,7 +949,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -965,12 +966,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Pojedyncze pakiety wirtualne (Single virtual packages)</literal> - "
"liczba pakietów, dla których istnieje tylko jeden pakiet, który dostarcza "
-"danego pakietu wirtualnego. Na przykład, w systemie Debian GNU/Linux \"X11-"
+"danego pakietu wirtualnego. Na przykład, w systemie Debian \"X11-"
"text-viewer\" jest pakietem wirtualnym, ale tylko jeden pakiet - xless - "
"dostarcza \"X11-text-viewer\"."
@@ -980,13 +981,13 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mieszane pakiety wirtualne (Mixed virtual packages)</literal> - "
"liczba pakietów, które albo dostarczają poszczególnych pakietów wirtualnych, "
"albo nazywają się tak, jak nazwa pakietu wirtualnego. Na przykład w "
-"systemie Debian GNU/Linux \"debconf\" jest zarówno zwykłym pakietem, jak i "
+"systemie Debian \"debconf\" jest zarówno zwykłym pakietem, jak i "
"jest pakietem dostarczanym przez pakiet debconf-tiny."
#
@@ -1094,17 +1095,27 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>. It searches the package names "
+#| "and the descriptions for an occurrence of the regular expression and "
+#| "prints out the package name and the short description, including virtual "
+#| "package names. If <option>--full</option> is given then output identical "
+#| "to <literal>show</literal> is produced for each matched package, and if "
+#| "<option>--names-only</option> is given then the long description is not "
+#| "searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
"<literal>search</literal> wykonuje pełne wyszukiwanie podanego wzorca "
"będącego wyrażeniem regularnym POSIX (patrz "
@@ -1120,7 +1131,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1130,7 +1141,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1140,7 +1151,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1149,7 +1160,7 @@ msgstr ""
"danego pakietu."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
#, fuzzy
#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
@@ -1157,7 +1168,7 @@ msgstr "pkgnames <replaceable>[ prefiks ]</replaceable>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -1172,7 +1183,7 @@ msgstr ""
"używać z opcją <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -1185,7 +1196,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1207,7 +1218,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1222,12 +1233,12 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1237,7 +1248,7 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
#, fuzzy
#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
@@ -1245,7 +1256,7 @@ msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1259,7 +1270,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1277,7 +1288,7 @@ msgstr ""
"pakietów (<literal>APT::Architecture</literal>)."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
@@ -1285,7 +1296,7 @@ msgstr "opcje"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1297,7 +1308,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1314,7 +1325,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1329,7 +1340,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1341,7 +1352,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
#, fuzzy
#| msgid ""
#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
@@ -1361,7 +1372,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1371,7 +1382,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1390,7 +1401,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1403,7 +1414,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1413,7 +1424,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1426,7 +1437,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1439,7 +1450,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1449,49 +1460,37 @@ msgstr ""
"literal> tylko do pakietów, które są obecnie zainstalowane. Pozycja w pliku "
"konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "Pliki"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr "Zobacz także"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnostyka"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1532,7 +1531,7 @@ msgstr ""
"w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie."
#
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
#, fuzzy
#| msgid ""
@@ -1555,7 +1554,7 @@ msgstr ""
"poproszony o podanie opisu dysku."
#
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1567,7 +1566,7 @@ msgstr ""
"<filename>&statedir;/cdroms.list</filename>"
#
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
@@ -1576,26 +1575,14 @@ msgstr ""
"Narzędzie debugujące, wyświetlające identyfikator włożonego dysku oraz nazwę "
"pliku, w którym jest przechowywany."
-#
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
-"<option>-h</option> lub <option>--help</option>. <placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr "Opcje"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1608,7 +1595,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1621,7 +1608,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1633,7 +1620,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1648,7 +1635,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1661,7 +1648,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1673,13 +1660,13 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1705,16 +1692,6 @@ msgstr ""
"dostęp do głównego pliku konfiguracyjnego <filename>/etc/apt/apt.conf</"
"filename> w sposób łatwy do użycia w programach skryptowych."
-#
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
-"<option>-h</option> albo <option>--help</option>."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -2028,8 +2005,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "Dir Section"
+#, fuzzy
+#| msgid "the <literal>Origin:</literal> line"
+msgid "<literal>Dir</literal> Section"
+msgstr "linia <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:146
@@ -2067,8 +2046,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr ""
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Default</literal> Section"
+msgstr "linia <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:178
@@ -2146,8 +2127,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr ""
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "linia <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:244
@@ -2260,8 +2243,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr ""
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Tree</literal> Section"
+msgstr "linia <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:344
@@ -2354,8 +2339,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr ""
+#, fuzzy
+#| msgid "the <literal>Component:</literal> line"
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "linia <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:412
@@ -2610,7 +2597,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr "Przykłady"
@@ -2765,7 +2752,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2778,7 +2765,7 @@ msgstr ""
"Po <literal>install</literal> musi występować nazwa jednego lub więcej "
"pakietów przeznaczonych do zainstalowania. Każdy argument jest nazwą "
"pakietu, a nie pełną nazwą pliku, w którym się znajduje (na przykład w "
-"systemie Debian GNU/Linux, tym argumentem byłoby libc6, a nie "
+"systemie Debian, tym argumentem byłoby libc6, a nie "
"<literal>libc6_1.9.6-2.deb</literal>). Wszystkie pakiety, które są "
"potrzebne do zainstalowania żądanego(-ych) pakietu(-ów), będą także "
"ściągnięte i zainstalowane. Plik <filename>/etc/apt/sources.list</filename> "
@@ -3572,15 +3559,6 @@ msgstr ""
"nieostrzeganie o tym. Jest to użyteczne dla programów typu pbuilder. Pozycja "
"w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-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:530
@@ -3649,12 +3627,9 @@ msgstr "Usuwa klucz z listy zaufanych kluczy."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:74
-#, fuzzy
-#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgid "Output the key &synopsis-param-keyid; to standard output."
msgstr ""
-"Wyświetla klucz o podanym <replaceable>id_klucza</replaceable> na "
-"standardowe wyjście."
+"Wyświetla klucz o podanym &synopsis-param-keyid; na standardowe wyjście."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:85
@@ -3734,11 +3709,6 @@ msgstr ""
"filename>. <filename>trusted.gpg</filename> jest podstawową składnicą "
"kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -3909,46 +3879,22 @@ msgstr ""
"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
"osobnej linii."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
-#, fuzzy
-#| 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>."
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku o "
-"podanej <replaceable>NAZWIE_PLIKU</replaceable>. Nie jest wtedy używana "
-"domyślny plik <filename>extended_status</filename> znajdujący się w katalogu "
-"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
+"podanej &synopsis-param-filename;. Nie jest wtedy używana domyślny plik "
+"<filename>extended_status</filename> znajdujący się w katalogu określonym w "
+"pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4600,6 +4546,13 @@ msgstr ""
msgid "The Acquire Group"
msgstr ""
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -4988,13 +4941,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -5386,13 +5332,10 @@ msgstr ""
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.conf.5.xml:775
-#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
-"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:785
@@ -5593,11 +5536,6 @@ msgid ""
"possible options."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -5715,12 +5653,17 @@ msgid ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
-#, fuzzy
-#| msgid "priority 100"
msgid "priority 1"
-msgstr "priorytet 100"
+msgstr "priorytet 1"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:107
@@ -5769,14 +5712,6 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -5932,18 +5867,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:220
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: origin \"\"\n"
-#| "Pin-Priority: 999\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: origin \"ftp.de.debian.org\"\n"
"Pin-Priority: 999\n"
msgstr ""
"Package: *\n"
-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -5986,18 +5917,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:242
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
msgstr ""
"Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -6037,19 +5964,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
"Pin: release n=experimental\n"
"Pin-Priority: 500\n"
msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:279
@@ -6061,19 +5984,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=karmic*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:291
@@ -6091,6 +6010,13 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -6176,14 +6102,6 @@ msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -6272,6 +6190,18 @@ msgid ""
"describe the packages available at that location."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -6293,16 +6223,16 @@ msgid "gives the version number for the named package"
msgstr "podaje numer wersji danego pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -6345,16 +6275,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:455
-#, fuzzy, no-wrap
-#| msgid "Pin: release a=stable\n"
+#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release a=stable\n"
+msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
@@ -6435,20 +6364,6 @@ msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6483,7 +6398,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:555
-#, fuzzy, no-wrap
+#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
"Explanation: package versions other than those in the stable distro\n"
@@ -6495,15 +6410,6 @@ msgid ""
"Pin: release o=Debian\n"
"Pin-Priority: -10\n"
msgstr ""
-"Explanation: Uninstall or do not install any Debian-originated\n"
-"Explanation: package versions other than those in the stable distro\n"
-"Package: *\n"
-"Pin: release a=stable\n"
-"Pin-Priority: 900\n"
-"\n"
-"Package: *\n"
-"Pin: release o=Debian\n"
-"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:549
@@ -6630,7 +6536,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:654
-#, fuzzy, no-wrap
+#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
@@ -6647,20 +6553,6 @@ msgid ""
"Pin: release o=Debian\n"
"Pin-Priority: -10\n"
msgstr ""
-"Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
-"Package: *\n"
-"Pin: release n=squeeze\n"
-"Pin-Priority: 900\n"
-"\n"
-"Explanation: Debian unstable is always codenamed with sid\n"
-"Package: *\n"
-"Pin: release a=sid\n"
-"Pin-Priority: 800\n"
-"\n"
-"Package: *\n"
-"Pin: release o=Debian\n"
-"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:642
@@ -6704,11 +6596,6 @@ msgid ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6724,12 +6611,12 @@ msgstr "Lista zasobów pakietów dla APT"
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"Lista zasobów pakietów jest używana do zlokalizowania archiwów pakietów "
"używanego systemu dystrybucji pakietów. Obecnie ta strona podręcznika "
-"opisuje tylko system pakietów używany w systemie Debian GNU/Linux. Plikiem "
+"opisuje tylko system pakietów używany w systemie Debian. Plikiem "
"kontrolnym jest <filename>/etc/apt/sources.list</filename>."
#. type: Content of: <refentry><refsect1><para>
@@ -6963,18 +6850,14 @@ msgstr "Kilka przykładów:"
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:135
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
-#| " "
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
msgstr ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
#. type: Content of: <refentry><refsect1><title>
@@ -6982,13 +6865,15 @@ msgstr ""
msgid "URI specification"
msgstr "Określanie URI"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "więcej rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6998,13 +6883,8 @@ msgstr ""
"plików. Jest użyteczny dla katalogów montowanych przez NFS i lokalnych kopii "
"archiwów."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7013,13 +6893,8 @@ msgstr ""
"Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
"list."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -7035,13 +6910,8 @@ msgstr ""
"hasło@serwer:port/. Proszę zauważyć, że taki sposób autoryzacji nie jest "
"bezpieczny."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7059,13 +6929,8 @@ msgstr ""
"tej i TYLKO tej metody. Podane w pliku konfiguracyjnym serwery proxy ftp "
"używające http zostaną zignorowane."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7076,18 +6941,8 @@ msgstr ""
"katalogu bufora. Jest to użyteczne w przypadku używania dysku przenośnego do "
"skopiowania plików przy użyciu APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -7103,21 +6958,32 @@ msgstr ""
"ze zdalnego komputera."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
msgstr "więcej rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
+#, fuzzy
+#| 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. maintains "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similar 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>."
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
"APT może być rozszerzone o więcej metod, pochodzących z innych opcjonalnych "
"pakietów, które powinny się nazywać <literal>apt-transport-"
@@ -7130,16 +6996,7 @@ msgstr ""
"citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Obecnie rozpoznawane są następujące typy URI: cdrom, file, http, ftp, copy, "
-"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7148,36 +7005,36 @@ msgstr ""
"debian dla zasobów stable/main, stable/contrib i stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
#, 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:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, 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:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr "Linie źródeł dla powyższego przykładu"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7185,22 +7042,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
-#| " "
+#: sources.list.5.xml:224
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgstr ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
-" "
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7209,33 +7061,28 @@ msgstr ""
"org i dystrybucji hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
#, 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:234
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the stable/contrib area."
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
"Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.debian.org i "
-"dystrybucji stable/contrib."
+"dystrybucji &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#: sources.list.5.xml:233
+#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -7248,20 +7095,19 @@ msgstr ""
"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, 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><literallayout>
-#: sources.list.5.xml:251
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#: sources.list.5.xml:248
+#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -7269,8 +7115,7 @@ msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
#| "filename> on m68k, and so forth for other supported architectures. [Note "
#| "this example only illustrates how to use the substitution variable; non-"
-#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
-#| "id=\"0\"/>"
+#| "us is no longer structured like this]"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7285,11 +7130,10 @@ msgstr ""
"znalezionych w podkatalogu <filename>unstable/binary-i386</filename>, a dla "
"komputerów m68k <filename>unstable/binary-m68k</filename>; i tak dalej dla "
"innych architektur. (Uwaga: ten przykład jest tylko ilustracją, jak używać "
-"zmiennych podstawienia non-us obecnie nie zawiera już takiej struktury). "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"zmiennych podstawienia non-us obecnie nie zawiera już takiej struktury)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache;, &apt-conf;"
@@ -7336,7 +7180,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
"Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst "
@@ -8838,135 +8682,82 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Które użyje pobranych uprzednio archiwów z dysku."
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 sierpnia 2009</date>"
+#~ msgid "&apt-commonoptions;"
+#~ msgstr "&apt-commonoptions;"
-#~ msgid "ORIGINAL AUTHORS"
-#~ msgstr "AUTORZY ORYGINAŁU"
+#~ msgid "&file-sourceslist; &file-statelists;"
+#~ msgstr "&file-sourceslist; &file-statelists;"
-#~ msgid "&apt-author.jgunthorpe;"
-#~ msgstr "&apt-author.jgunthorpe;"
-
-#~ msgid "CURRENT AUTHORS"
-#~ msgstr "OBECNI AUTORZY"
-
-#~ msgid "&apt-author.team;"
-#~ msgstr "&apt-author.team;"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
+#
+#~ msgid ""
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present. <placeholder type="
+#~ "\"variablelist\" id=\"0\"/>"
#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 sierpnia 2009</date>"
+#~ "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
+#~ "<option>-h</option> lub <option>--help</option>. <placeholder type="
+#~ "\"variablelist\" id=\"0\"/>"
-#, 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;"
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present."
#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#~ "firstname> <surname>Burrows</surname> <contrib>Pierwsza dokumentacja "
-#~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#~ "email; &apt-product; <date>18 września 2009</date>"
+#~ "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
+#~ "<option>-h</option> albo <option>--help</option>."
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
-#~ msgid "&apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>4 maja 2009</date>"
+#~ msgid "Dir Section"
+#~ msgstr "Dir Section"
#~ msgid ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 October 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
#~ msgstr ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 października 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>14 February 2004</date>"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>2012-05-21T05:49:00+01:00</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
-#~ "product; <date>14 lutego 2004</date>"
+#~ msgid "&file-trustedgpg;"
+#~ msgstr "&file-trustedgpg;"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
-#~ "product; <date>14 lutego 2004</date>"
+#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
+#~ msgstr "<replaceable>&synopsis-filename;</replaceable>"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
-#~ "product; <date>29 lutego 2004</date>"
+#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
+#~ msgstr "&apt-get;,&aptitude;,&apt-conf;"
-#~ 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 sierpnia 2009</date>"
+#~ msgid "&file-aptconf;"
+#~ msgstr "&file-aptconf;"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 November 2008</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
-#~ "product; <date>8 listopada 2008</date>"
+#~ msgid "&file-preferences;"
+#~ msgstr "&file-preferences;"
+
+#~ msgid "file"
+#~ msgstr "file"
+
+#~ msgid "cdrom"
+#~ msgstr "cdrom"
+
+#~ msgid "http"
+#~ msgstr "http"
+
+#~ msgid "ftp"
+#~ msgstr "ftp"
+
+#~ msgid "copy"
+#~ msgstr "copy"
+
+#~ msgid "rsh"
+#~ msgstr "rsh"
+
+#~ msgid "ssh"
+#~ msgstr "ssh"
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>9 August 2009</date>"
#~ msgid ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>21 April 2011</date>"
+#~ "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
+#~ "rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>9 sierpnia 2009</date>"
+#~ "Obecnie rozpoznawane są następujące typy URI: cdrom, file, http, ftp, "
+#~ "copy, ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#~ msgid ""
#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
@@ -9035,13 +8826,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze nonus.debian."
#~ "org, w katalogu debian-non-US."
-#~ 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"
-
#~ msgid "OPTIONS"
#~ msgstr "OPCJE"
@@ -9052,9 +8836,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ msgid "FILES"
#~ msgstr "PLIKI"
-#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
-#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
#~ msgid ""
#~ "Status list of auto-installed packages. Configuration Item: "
#~ "<literal>Dir::State</literal> sets the path to the "
@@ -9063,6 +8844,3 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ "Lista stanów pakietów zainstalowanych automatycznie. Pozycja w pliku "
#~ "konfiguracyjnym: <literal>Dir::State</literal> ustawia ścieżkę do pliku "
#~ "o nazwie <filename>extended_states</filename>."
-
-#~ msgid "Pin: release n=squeeze\n"
-#~ msgstr "Pin: release n=squeeze\n"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index e9979b6b8..36a5bb607 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\n"
"PO-Revision-Date: 2010-08-25 23:07+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -33,8 +33,8 @@ msgstr "16 Junho 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -405,7 +405,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -517,7 +517,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -788,7 +788,8 @@ msgstr ""
"a partir dos metadados do pacote."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -805,8 +806,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -916,14 +917,14 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
"<literal>Pure virtual packages</literal> é o número de pacotes que existem "
"apenas como nome de pacote virtual; isto é, os pacotes apenas "
"\"disponibilizam\" o nome do pacote virtual, e nenhum pacote usa realmente o "
-"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian GNU/Linux é um "
+"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian é um "
"pacote puramente virtual; vários pacotes disponibilizam \"mail-transport-"
"agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"."
@@ -932,12 +933,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Single virtual packages</literal> é o número de pacotes com apenas "
"um pacote a disponibilizar um pacote virtual particular. Por exemplo, no "
-"sistema Debian GNU/Linux, \"X11-text-viewer\" é um pacote virtual, mas "
+"sistema Debian, \"X11-text-viewer\" é um pacote virtual, mas "
"apenas um pacote, xless, disponibiliza \"X11-text-viewer\"."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -945,12 +946,12 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mixed virtual packages</literal> é o número de pacotes que ou "
"disponibilizam um pacote virtual particular ou têm o nome de pacote virtual "
-"como o nome de pacote. Por exemplo, no sistema Debian GNU/Linux, \"debconf\" "
+"como o nome de pacote. Por exemplo, no sistema Debian, \"debconf\" "
"é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -1049,17 +1050,27 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>. It searches the package names "
+#| "and the descriptions for an occurrence of the regular expression and "
+#| "prints out the package name and the short description, including virtual "
+#| "package names. If <option>--full</option> is given then output identical "
+#| "to <literal>show</literal> is produced for each matched package, and if "
+#| "<option>--names-only</option> is given then the long description is not "
+#| "searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
"<literal>search</literal> executa uma busca de texto completo em todas as "
"listas de pacotes disponíveis para o padrão POSIX regex fornecido, veja "
@@ -1073,7 +1084,7 @@ msgstr ""
"longa, apenas no nome do pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1082,7 +1093,7 @@ msgstr ""
"busca os quais são lidados em conjunto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1092,7 +1103,7 @@ msgstr ""
"dependência."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1101,14 +1112,12 @@ msgstr ""
"que um pacote tem."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
-#, fuzzy
-#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+#: apt-cache.8.xml:195
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
-msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -1123,7 +1132,7 @@ msgstr ""
"opção <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -1134,7 +1143,7 @@ msgstr ""
"também são listados na lista gerada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1155,7 +1164,7 @@ msgstr ""
"defina a opção <literal>APT::Cache::GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1169,14 +1178,14 @@ msgstr ""
"verdes são conflitos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
"pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1186,14 +1195,12 @@ msgstr ""
"VCG</ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:229
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
-msgstr "madison <replaceable>[ pacote(s) ]</replaceable>"
+msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1206,7 +1213,7 @@ msgstr ""
"acerca da selecção de prioridade do pacote nomeado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1225,14 +1232,14 @@ msgstr ""
"Architecture</literal>)."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "opções"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1243,7 +1250,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1258,7 +1265,7 @@ msgstr ""
"pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1272,7 +1279,7 @@ msgstr ""
"Configuração: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1283,7 +1290,7 @@ msgstr ""
"Configuração: <literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
#, fuzzy
#| msgid ""
#| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@ -1305,7 +1312,7 @@ msgstr ""
"ex. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1314,7 +1321,7 @@ msgstr ""
"<literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1331,7 +1338,7 @@ msgstr ""
"Configuração: <literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1343,7 +1350,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1352,7 +1359,7 @@ msgstr ""
"Configuração: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1363,7 +1370,7 @@ msgstr ""
"<literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1374,7 +1381,7 @@ msgstr ""
"Configuração <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1384,47 +1391,35 @@ msgstr ""
"aos pacotes que estão actualmente instalados. Item de Configuração: "
"<literal>APT::Cache::Installed</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "Ficheiros"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
msgid "See Also"
msgstr "Veja também"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnóstico"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1462,7 +1457,7 @@ msgstr ""
"de vários discos tem que ser inserido e sondado separadamente para ter em "
"conta possíveis falhas."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1477,7 +1472,7 @@ msgstr ""
"disco não possuir um directório <filename>disk</filename> apropriado, ser-"
"lhe-à pedido um título descritivo."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1488,7 +1483,7 @@ msgstr ""
"drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
"list</filename>"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
@@ -1497,24 +1492,13 @@ msgstr ""
"Uma ferramenta de depuração para reportar a identificação do disco actual "
"assim como o nome de ficheiro armazenado"
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
-"fornecida, um dos comandos abaixo têm que estar presentes. <placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr "Opções"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1526,7 +1510,7 @@ msgstr ""
"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1538,7 +1522,7 @@ msgstr ""
"CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1549,7 +1533,7 @@ msgstr ""
"NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1562,7 +1546,7 @@ msgstr ""
"configuração: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1573,7 +1557,7 @@ msgstr ""
"estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1584,12 +1568,12 @@ msgstr ""
"configuração: <literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1615,15 +1599,6 @@ msgstr ""
"ficheiro de configuração principal <filename>/etc/apt/apt.conf</filename> de "
"um modo que é fácil de usar para aplicações em script."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
-"fornecida, um dos comandos abaixo têm que estar presentes."
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -1750,13 +1725,6 @@ msgstr "pacote versão ficheiro-modelo script-de-configuração"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:45
-#, fuzzy
-#| msgid ""
-#| "template-file and config-script are written to the temporary directory "
-#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
-#| "TempDir</literal>) directory, with filenames of the form "
-#| "<filename>package.template.XXXX</filename> and <filename>package.config."
-#| "XXXX</filename>"
msgid ""
"template-file and config-script are written to the temporary directory "
"specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -1765,10 +1733,10 @@ msgid ""
"<filename>package.config.XXXX</filename>"
msgstr ""
"ficheiro-modelo e script-de-configuração são escritos num directório "
-"temporário especificado por -t ou --tempdir (<literal>APT::"
-"ExtractTemplates::TempDir</literal>) directório, com nomes de ficheiros no "
-"formato <filename>pacote.modelo.XXXX</filename> e <filename>pacote."
-"configuração.XXXX</filename>"
+"temporário especificado por <option>-t</option> ou <option>--tempdir</"
+"option> (<literal>APT::ExtractTemplates::TempDir</literal>) directório, com "
+"nomes de ficheiros no formato <filename>pacote.modelo.XXXX</filename> e "
+"<filename>pacote.configuração.XXXX</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
@@ -1996,8 +1964,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "Secção Dir"
+#, fuzzy
+#| msgid "the <literal>Origin:</literal> line"
+msgid "<literal>Dir</literal> Section"
+msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:146
@@ -2043,8 +2013,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr "Secção Default"
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Default</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:178
@@ -2147,8 +2119,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr "Secção TreeDefault"
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:244
@@ -2303,8 +2277,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr "Secção Tree"
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Tree</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:344
@@ -2422,7 +2398,9 @@ msgstr "Define o ficheiro de sobreposição extra fonte."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
+#, fuzzy
+#| msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
msgstr "Secção BinDirectory"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2724,7 +2702,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
msgid "Examples"
msgstr "Examples"
@@ -2867,7 +2845,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -3621,15 +3599,6 @@ msgstr ""
"é útil para ferramentas como o pbuilder. Item de Configuração: <literal>APT::"
"Get::AllowUnauthenticated</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-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:530
msgid ""
@@ -3694,11 +3663,8 @@ msgstr "Remove uma chave da lista de chaves de confiança."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:74
-#, fuzzy
-#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgid "Output the key &synopsis-param-keyid; to standard output."
-msgstr ""
-"Escreve o <replaceable>id de chave</replaceable> da chave na saída standard."
+msgstr "Escreve o &synopsis-param-keyid; da chave na saída standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:85
@@ -3779,11 +3745,6 @@ msgstr ""
"filename> é o chaveiro principal o que significa que, por exemplo, as novas "
"chaves são adicionadas a este."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -3951,13 +3912,6 @@ msgstr ""
"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
"instalados automaticamente com cada pacote numa linha nova."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr "xvcg <replaceable>pacote(s)</replaceable>"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
#, fuzzy
@@ -3968,28 +3922,16 @@ msgstr "xvcg <replaceable>pacote(s)</replaceable>"
#| "Configuration Item: <literal>Dir::State</literal>."
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
-"Lê/Escreve o estado de pacote a partir de "
-"<filename><replaceable>NOME_DE_FICHEIRO</replaceable></filename> em vez da "
-"localização predefinida, a qual é <filename>extended_status</filename> no "
+"Lê/Escreve o estado de pacote a partir de &synopsis-param-filename; em vez "
+"da localização predefinida, a qual é <filename>extended_status</filename> no "
"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
-msgstr " &file-extended_states;"
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4292,14 +4234,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:198
-#, fuzzy
-#| msgid ""
-#| "For more background information you might want to review the <ulink url="
-#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
-#| "Manual (available also in the harden-doc package) and the <ulink url="
-#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-#| "Distribution HOWTO</ulink> by V. Alex Brennen."
msgid ""
"For more background information you might want to review the <ulink url="
"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -4309,11 +4243,11 @@ msgid ""
"ulink> by V. Alex Brennen."
msgstr ""
"Para mais informação de fundo você deve querer reler a <ulink url=\"http://"
-"www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-"\">Infraestrutura de Segurança da Debian</ulink> no capítulo do Manual "
-"Debian de Segurança (disponível também no pacote harden-doc) e o <ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-"Distribution HOWTO</ulink> de V. Alex Brennen."
+"www.debian.org/doc/manuals/securing-debian-howto/ch7\">Infraestrutura de "
+"Segurança da Debian</ulink> no capítulo do Manual Debian de Segurança "
+"(disponível também no pacote harden-doc) e o <ulink url=\"http://www."
+"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+"ulink> de V. Alex Brennen."
#. type: Content of: <refentry><refsect1><title>
#: apt-secure.8.xml:211
@@ -4934,6 +4868,20 @@ msgstr ""
msgid "The Acquire Group"
msgstr "O Grupo Acquire"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers. <placeholder type=\"variablelist\" id="
+#| "\"0\"/>"
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes "
+"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -5562,15 +5510,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes "
-"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -6430,11 +6369,6 @@ msgstr ""
"&configureindex; é um ficheiro de configuração que mostra valores exemplo "
"para todas as opções possíveis."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -6592,6 +6526,21 @@ msgstr ""
"especificamente imobilizados. Por exemplo, <placeholder type=\"programlisting"
"\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+#, fuzzy
+#| msgid ""
+#| "If the target release has been specified then APT uses the following "
+#| "algorithm to set the priorities of the versions of a package. Assign: "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+"Se o lançamento destinado foi especificado, então o APT usa o seguinte "
+"algoritmo para definir as prioridades das versões de um pacote. Atribuir: "
+"<placeholder type=\"variablelist\" id=\"0\"/>"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
msgid "priority 1"
@@ -6663,17 +6612,6 @@ msgstr ""
"para as versões que não estão instaladas e pertencem ao lançamento destinado."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Se o lançamento destinado foi especificado, então o APT usa o seguinte "
-"algoritmo para definir as prioridades das versões de um pacote. Atribuir: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
#, fuzzy
#| msgid ""
@@ -7006,19 +6944,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
"Pin: release n=experimental\n"
"Pin-Priority: 500\n"
msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:279
@@ -7030,19 +6964,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=karmic*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:291
@@ -7060,6 +6990,21 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta as Prioridades"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Priorities (P) assigned in the APT preferences file must be positive or "
+#| "negative integers. They are interpreted as follows (roughly speaking): "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+"As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser "
+"inteiros positivos ou negativos. Elas são interpretadas como o seguinte "
+"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
@@ -7143,17 +7088,6 @@ msgid "prevents the version from being installed"
msgstr "previne a instalação da versão"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser "
-"inteiros positivos ou negativos. Elas são interpretadas como o seguinte "
-"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
@@ -7264,6 +7198,36 @@ msgstr ""
"ficheiros <filename>Packages</filename> e <filename>Release</filename> para "
"descrever os pacotes disponíveis nessa localização."
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+#, fuzzy
+#| msgid ""
+#| "The <filename>Packages</filename> file is normally found in the directory "
+#| "<filename>.../dists/<replaceable>dist-name</replaceable>/"
+#| "<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+#| "filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+#| "Packages</filename>. It consists of a series of multi-line records, one "
+#| "for each package available in that directory. Only two lines in each "
+#| "record are relevant for setting APT priorities: <placeholder type="
+#| "\"variablelist\" id=\"0\"/>"
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"O ficheiro <filename>Packages</filename> é normalmente encontrado no "
+"directório <filename>.../dists/<replaceable>nome-da-distribuição</"
+"replaceable>/<replaceable>componente</replaceable>/"
+"<replaceable>arquitectura</replaceable></filename>: por exemplo, "
+"<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste "
+"numa série de registos de várias linhas, um para cada pacote disponível "
+"nesse directório. Apenas duas linhas em cada registo são relevantes para "
+"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
@@ -7285,25 +7249,37 @@ msgid "gives the version number for the named package"
msgstr "fornece o número de versão do pacote nomeado"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
+#, fuzzy
+#| msgid ""
+#| "The <filename>Release</filename> file is normally found in the directory "
+#| "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+#| "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+#| "dists/&stable-codename;/Release</filename>. It consists of a single "
+#| "multi-line record which applies to <emphasis>all</emphasis> of the "
+#| "packages in the directory tree below its parent. Unlike the "
+#| "<filename>Packages</filename> file, nearly all of the lines in a "
+#| "<filename>Release</filename> file are relevant for setting APT "
+#| "priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
-"O ficheiro <filename>Packages</filename> é normalmente encontrado no "
-"directório <filename>.../dists/<replaceable>nome-da-distribuição</"
-"replaceable>/<replaceable>componente</replaceable>/"
-"<replaceable>arquitectura</replaceable></filename>: por exemplo, "
-"<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste "
-"numa série de registos de várias linhas, um para cada pacote disponível "
-"nesse directório. Apenas duas linhas em cada registo são relevantes para "
-"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+"O ficheiro <filename>Release</filename> fica normalmente no directório "
+"<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
+"filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "
+"<filename>.../dists/&stable-codename;/Release</filename>. Consiste num único "
+"registo de várias linhas que se aplica a <emphasis>todos</emphasis> os "
+"pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro "
+"<filename>Packages</filename>, quase todas as linhas num ficheiro "
+"<filename>Release</filename> são relevantes para definir as prioridades do "
+"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:428
@@ -7365,13 +7341,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem "
-"pertencer ao lançamento de Debian GNU/Linux versão 3.0. Note que não há "
+"pertencer ao lançamento de Debian versão 3.0. Note que não há "
"normalmente um número de versão para as distribuições <literal>testing</"
"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. "
"Especificar isto no ficheiro de preferências do APT irá requerer uma das "
@@ -7467,29 +7443,6 @@ msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"O ficheiro <filename>Release</filename> fica normalmente no directório "
-"<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
-"filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "
-"<filename>.../dists/&stable-codename;/Release</filename>. Consiste num único "
-"registo de várias linhas que se aplica a <emphasis>todos</emphasis> os "
-"pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro "
-"<filename>Packages</filename>, quase todas as linhas num ficheiro "
-"<filename>Release</filename> são relevantes para definir as prioridades do "
-"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7811,11 +7764,6 @@ msgstr ""
"<literal>sid</literal> mais recente se essa for mais recente que a versão "
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7831,12 +7779,12 @@ msgstr "Lista de recursos de pacote para APT"
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"A lista de recursos de pacote é usada para localizar arquivos do sistema de "
"distribuição de pacotes usado no sistema. Neste momento, este manual "
-"documenta apenas o sistema de pacotes usado pelo sistema Debian GNU/Linux. "
+"documenta apenas o sistema de pacotes usado pelo sistema Debian. "
"Este ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
#. type: Content of: <refentry><refsect1><para>
@@ -8082,13 +8030,15 @@ msgstr ""
msgid "URI specification"
msgstr "Especificação da URI"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "tipos de URI mais reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8098,13 +8048,8 @@ msgstr ""
"seja considerado um arquivo. Isto é útil para montagens NFS e mirrors ou "
"arquivos locais."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8113,13 +8058,8 @@ msgstr ""
"media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
"fontes."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -8135,13 +8075,8 @@ msgstr ""
"string do formato http://user:pass@server:port/. Note que este não é um "
"método de autenticação seguro."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8159,13 +8094,8 @@ msgstr ""
"usando este método e APENAS este método. Os proxies ftp que usam http e seja "
"especificados no ficheiro de configuração serão ignorados."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8176,18 +8106,8 @@ msgstr ""
"localização. Isto é útil para quem use um disco zip para copiar ficheiros "
"com o APT."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8202,21 +8122,32 @@ msgstr ""
"para executar as transferências de ficheiros remotos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
msgstr "tipos de URI mais reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
+#, fuzzy
+#| 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. maintains "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similar 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>."
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
"O APT pode ser estendido com mais métodos lançados em outros pacotes "
"opcionais que devem seguir o esquema de nomeação <literal>apt-transport-"
@@ -8229,16 +8160,7 @@ msgstr ""
"<manvolnum>1</manvolnum></citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Os tipos de URI actualmente reconhecidos são cdrom, file, http, ftp, copy, "
-"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8247,36 +8169,36 @@ msgstr ""
"para stable/main, stable/contrib, e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
#, 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:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, 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:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr "Linha de fonte para o referido acima"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8284,22 +8206,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-#| " "
+#: sources.list.5.xml:224
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8308,13 +8225,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
#, 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:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -8323,13 +8240,13 @@ msgstr ""
"usa apenas a área &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -8342,20 +8259,19 @@ msgstr ""
"uma única sessão FTP para ambas linhas de recurso."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, 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><literallayout>
-#: sources.list.5.xml:251
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#: sources.list.5.xml:248
+#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -8363,8 +8279,7 @@ msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
#| "filename> on m68k, and so forth for other supported architectures. [Note "
#| "this example only illustrates how to use the substitution variable; non-"
-#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
-#| "id=\"0\"/>"
+#| "us is no longer structured like this]"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8379,11 +8294,10 @@ msgstr ""
"i386</filename> em máquinas i386, <filename>unstable/binary-m68k</filename> "
"em m68k, e assim por diante para outras arquitecturas suportadas. [Note que "
"este exemplo apenas mostra como usar a variável de substituição; non-us já "
-"não é mais estruturado desta maneira] <placeholder type=\"literallayout\" id="
-"\"0\"/>"
+"não é mais estruturado desta maneira]"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -8431,10 +8345,10 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"Para mais detalhes em sistemas Debian GNU/Linux, veja o ficheiro /usr/share/"
+"Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/"
"common-licenses/GPL para a licença completa."
#. type: <heading></heading>
@@ -9920,141 +9834,6 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 Agosto 2009</date>"
-
-#~ msgid "ORIGINAL AUTHORS"
-#~ msgstr "AUTORES ORIGINAIS"
-
-#~ msgid "&apt-author.jgunthorpe;"
-#~ msgstr "&apt-author.jgunthorpe;"
-
-#~ msgid "CURRENT AUTHORS"
-#~ msgstr "AUTORES ACTUAIS"
-
-#~ msgid "&apt-author.team;"
-#~ msgstr "&apt-author.team;"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>17 August 2009</date>"
-#~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 Agosto 2009</date>"
-
-#, 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>16 January 2010</date>"
-#~ 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;"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#~ "firstname> <surname>Burrows</surname> <contrib>Documentação inicial do "
-#~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#~ "email; &apt-product; <date>16 Janeiro 2010</date>"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-#~ msgid "&apt-author.team; &apt-email; &apt-product;"
-#~ msgstr ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>16 Fevereiro 2010</date>"
-
-#~ msgid ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 October 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-#~ msgstr ""
-#~ "<!-- Boiler plate docinfo section -->\n"
-#~ "<!ENTITY apt-docinfo \"\n"
-#~ " <refentryinfo>\n"
-#~ " <address><email>apt@packages.debian.org</email></address>\n"
-#~ " <author>\n"
-#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-#~ " <contrib></contrib>\n"
-#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
-#~ "copyright>\n"
-#~ " <date>28 Outubro 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>14 February 2004</date>"
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>2012-05-21T05:49:00+01:00</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 Fevereiro 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>14 Fevereiro 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 February 2004</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>29 Fevereiro 2004</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 August 2009</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>17 Agosto 2009</date>"
-
-#~ msgid ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 November 2008</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>08 Novembro 2008</date>"
-
-#, fuzzy
-#~| msgid ""
-#~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~| "<date>9 August 2009</date>"
-#~ msgid ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>21 April 2011</date>"
-#~ msgstr ""
-#~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#~ "Agosto 2009</date>"
-
#~ msgid ""
#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
#~ "get check</command>. It builds the source and package caches from the "
@@ -10209,13 +9988,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório "
#~ "debian-non-US."
-#~ 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"
-
#~ msgid "OPTIONS"
#~ msgstr "OPÇÕES"
@@ -10225,9 +9997,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ msgid "FILES"
#~ msgstr "FICHEIROS"
-#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
-#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
#~ msgid ""
#~ "Status list of auto-installed packages. Configuration Item: "
#~ "<literal>Dir::State</literal> sets the path to the "
@@ -10245,9 +10014,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "armazenar a informação 'disponível'. Isto define o tamanho dessa cache "
#~ "(em bytes)."
-#~ msgid "Pin: release n=squeeze\n"
-#~ msgstr "Pin: release n=squeeze\n"
-
#~ msgid ""
#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
@@ -10259,9 +10025,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "do último valor especificado numa linha que começa com <literal>Pin-"
#~ "Priority: release ...</literal>."
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
-
#~ msgid "Keyring of local trusted keys, new keys will be added here."
#~ msgstr ""
#~ "Chaveiro das chaves de confiança locais, as novas chaves serão "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 66735a86c..47c565ed1 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:15+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+0300\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"
@@ -34,7 +34,7 @@ msgstr ""
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
+msgid "Debian"
msgstr ""
#. type: SH
@@ -333,7 +333,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -404,7 +404,7 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -644,7 +644,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -659,8 +660,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
msgid "&synopsis-pkg;"
msgstr ""
@@ -735,7 +736,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -745,7 +746,7 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
@@ -754,7 +755,7 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
@@ -830,40 +831,38 @@ msgstr ""
#: apt-cache.8.xml:170
msgid ""
"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names. If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;. It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names. If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
#, fuzzy
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
@@ -871,7 +870,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
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 "
@@ -881,7 +880,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
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 "
@@ -889,7 +888,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -902,7 +901,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -911,19 +910,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
#, fuzzy
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
@@ -931,7 +930,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -940,7 +939,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -952,14 +951,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -967,7 +966,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -977,7 +976,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -986,7 +985,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -994,7 +993,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -1004,14 +1003,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1022,7 +1021,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1030,14 +1029,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1045,7 +1044,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1053,55 +1052,43 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
"<literal>APT::Cache::Installed</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
#, fuzzy
msgid "See Also"
msgstr "Consulte também"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1129,7 +1116,7 @@ msgid ""
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1139,7 +1126,7 @@ msgid ""
"title."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1147,28 +1134,20 @@ msgid ""
"filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present. <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1176,7 +1155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1184,7 +1163,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -1192,7 +1171,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1201,7 +1180,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1209,7 +1188,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1217,13 +1196,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
#, fuzzy
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1243,13 +1222,6 @@ msgid ""
"manner that is easy to use by scripted applications."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
msgid ""
@@ -1527,8 +1499,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:144
#, fuzzy
-msgid "Dir Section"
-msgstr "Descrição"
+msgid "<literal>Dir</literal> Section"
+msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:146
@@ -1566,8 +1538,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr ""
+#, fuzzy
+msgid "<literal>Default</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:178
@@ -1645,8 +1618,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr ""
+#, fuzzy
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:244
@@ -1759,8 +1733,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr ""
+#, fuzzy
+msgid "<literal>Tree</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:344
@@ -1849,8 +1824,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr ""
+#, fuzzy
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:412
@@ -2067,7 +2043,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
@@ -2165,7 +2141,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2660,13 +2636,6 @@ msgid ""
"AllowUnauthenticated</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:530
msgid ""
@@ -2779,11 +2748,6 @@ msgid ""
"this one."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
#, fuzzy
@@ -2901,37 +2865,17 @@ msgid ""
"the same way as for the other show commands."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
-#: apt-mark.8.xml:112 apt-mark.8.xml:113
-#, fuzzy
-msgid "<replaceable>&synopsis-filename;</replaceable>"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:115
msgid ""
"Read/Write package stats from the filename given with the parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
-"of from the default location, which is <filename>extended_status</filename> "
-"in the directory defined by the Configuration Item: <literal>Dir::State</"
-"literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid " &file-extended_states;"
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-#, fuzzy
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -3544,6 +3488,13 @@ msgstr ""
msgid "The Acquire Group"
msgstr ""
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:259
msgid ""
@@ -3932,13 +3883,6 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:512
msgid "Directories"
@@ -4523,11 +4467,6 @@ msgid ""
"possible options."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr ""
-
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1125
@@ -4667,6 +4606,17 @@ msgstr ""
"<command>apt-get</command> ou no arquivo de configuração do APT <filename>/"
"etc/apt/apt.conf</filename>. Por exemplo,"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+#, fuzzy
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package. Assign:"
+msgstr ""
+"Caso uma versão alvo tenha sido especificada o APT usará o seguinte "
+"algoritmo para definir as prioridades das instâncias de um pacote. "
+"Atribuirá :"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:106
#, fuzzy
@@ -4727,18 +4677,6 @@ msgstr ""
"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-#, fuzzy
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package. Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Caso uma versão alvo tenha sido especificada o APT usará o seguinte "
-"algoritmo para definir as prioridades das instâncias de um pacote. "
-"Atribuirá :"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:132
#, fuzzy
msgid ""
@@ -5132,6 +5070,17 @@ msgstr ""
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+#, fuzzy
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers. They are interpreted as follows (roughly speaking):"
+msgstr ""
+"Prioridades (P) atribuídas no arquivo de preferências do APT devem ser "
+"números inteiros positivos ou negativos. Eles são interpretados como a "
+"seguir (a grosso modo):"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:315
#, fuzzy
@@ -5226,18 +5175,6 @@ msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
-#, fuzzy
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers. They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Prioridades (P) atribuídas no arquivo de preferências do APT devem ser "
-"números inteiros positivos ou negativos. Eles são interpretados como a "
-"seguir (a grosso modo):"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
@@ -5358,6 +5295,27 @@ msgstr ""
"<filename>Packages</filename> e <filename>Release</filename> para descrever "
"os pacotes disponíveis nessas localidades."
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+#, fuzzy
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. It consists of a series of multi-line records, one for "
+"each package available in that directory. Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"O arquivo <filename>Packages</filename> é normalmente encontrado no "
+"diretório <filename>.../dists/<replaceable>nome-distribuição</replaceable>/"
+"<replaceable>componente</replaceable>/<replaceable>arquitetura</"
+"replaceable></filename> : por exemplo, <filename>.../dists/stable/main/"
+"binary-i386/Packages</filename>. O arquivo consiste de uma série de "
+"registros de múltiplas linhas, uma para cada pacote disponível no diretório. "
+"Somente duas linhas em cada registro são relevantes para definir prioridades "
+"do APT :"
+
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
#, fuzzy
@@ -5383,25 +5341,26 @@ msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
#, fuzzy
msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>. It consists of a series of multi-line records, one for "
-"each package available in that directory. Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent. Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
msgstr ""
-"O arquivo <filename>Packages</filename> é normalmente encontrado no "
-"diretório <filename>.../dists/<replaceable>nome-distribuição</replaceable>/"
-"<replaceable>componente</replaceable>/<replaceable>arquitetura</"
-"replaceable></filename> : por exemplo, <filename>.../dists/stable/main/"
-"binary-i386/Packages</filename>. O arquivo consiste de uma série de "
-"registros de múltiplas linhas, uma para cada pacote disponível no diretório. "
-"Somente duas linhas em cada registro são relevantes para definir prioridades "
+"O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
+"<filename>.../dists/<replaceable>nome-distribuição</replaceable></"
+"filename> : por exemplo, <filename>.../dists/stable/Release</filename>, ou "
+"<filename>.../dists/woody/Release</filename>. O arquivo consiste de um "
+"registro de múltiplas linhas o qual se aplica a <emphasis>todos</emphasis> "
+"os pacotes na àrvore de diretórios abaixo de seu diretório pai. Diferente do "
+"arquivo <filename>Packages</filename>, quase todas as linhas em um arquivo "
+"<filename>Release</filename> são relevantes para a definição de prioridades "
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -5473,13 +5432,13 @@ msgstr ""
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"dá nome a versão da distribuição. Por exemplo, os pacote na àrvore podem "
-"pertencer a distribuição Debian GNU/Linux versão 3.0. Note que normalmente "
+"pertencer a distribuição Debian versão 3.0. Note que normalmente "
"não existe número de versão para as distribuições <literal>testing</literal> "
"e <literal>unstable</literal> devido as mesmas não terem sido lançadas "
"ainda. Especificar isso no arquivo de preferências do APT iria requerer uma "
@@ -5587,30 +5546,6 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:417
-#, fuzzy
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>. It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent. Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
-"<filename>.../dists/<replaceable>nome-distribuição</replaceable></"
-"filename> : por exemplo, <filename>.../dists/stable/Release</filename>, ou "
-"<filename>.../dists/woody/Release</filename>. O arquivo consiste de um "
-"registro de múltiplas linhas o qual se aplica a <emphasis>todos</emphasis> "
-"os pacotes na àrvore de diretórios abaixo de seu diretório pai. Diferente do "
-"arquivo <filename>Packages</filename>, quase todas as linhas em um arquivo "
-"<filename>Release</filename> são relevantes para a definição de prioridades "
-"do APT :"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:523
#, fuzzy
msgid ""
@@ -5933,12 +5868,6 @@ msgstr ""
"versão <literal>unstable</literal> mais recente caso a mesma seja mais "
"recente que a versão instalada."
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-#, fuzzy
-msgid "&file-preferences;"
-msgstr "apt_preferences"
-
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:706
#, fuzzy
@@ -5955,7 +5884,7 @@ msgstr ""
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. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
@@ -6123,38 +6052,28 @@ msgstr ""
msgid "URI specification"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
"archives."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
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:"
@@ -6164,13 +6083,8 @@ msgid ""
"authentication."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6181,31 +6095,16 @@ msgid ""
"ignored."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
"This is useful for people using a zip disk to copy files around with APT."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -6215,67 +6114,59 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>. The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
"access methods for https-URIs with features similar 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:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
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:217
+#: sources.list.5.xml:214
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:216
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:219
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
#, 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:225
+#: sources.list.5.xml:222
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6283,7 +6174,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6291,33 +6182,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
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:232
+#: sources.list.5.xml:229
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:231
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
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 "
@@ -6326,19 +6217,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6350,7 +6241,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
#, fuzzy
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6393,7 +6284,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
@@ -7433,6 +7324,24 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid "Dir Section"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
+#~ msgstr ""
+#~ "<programlisting>\n"
+#~ "apt-get install <replaceable>pacote</replaceable>/testing\n"
+
+#, fuzzy
+#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
+#~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#, fuzzy
+#~ msgid "&file-preferences;"
+#~ msgstr "apt_preferences"
+
+#, fuzzy
#~ msgid "&apt-author.team; &apt-email; &apt-product;"
#~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po4a.conf b/doc/po4a.conf
index 2003e9f84..c9df1f9ac 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -4,10 +4,11 @@
# Entities need to be present, even if not translated
[po4a_alias:entity] text opt:"-k 0"
[po4a_alias:manpage] docbook opt:"\
- -o untranslated='<term><option> <refname> <refentrytitle> <date> <refentryinfo>' \
- -o break='<term><option>' \
- -o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo>' \
- -o inline='<para><option> <refentrytitle>'"
+ -o untranslated='<term><option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <term><command>' \
+ -o break='<term><option> <term><command>' \
+ -o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <command>' \
+ -o inline='<para><option> <refentrytitle> <para><command> <programlisting><command> <refentrytitle><command>' \
+ -o translated='<para><command> <programlisting><command> <refentrytitle><command>'"
# define source file and translated file (one file per line)
[type: man] apt.8 $lang:$lang/apt.$lang.8
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index eeff509ff..93bbb478d 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
@@ -36,7 +36,7 @@
<refsect1><title>Description</title>
<para>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.
+ documents only the packaging system used by the Debian system.
This control file is <filename>/etc/apt/sources.list</filename>.</para>
<para>The source list is designed to support any number of active sources and a
@@ -140,24 +140,23 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
<refsect1><title>URI specification</title>
- <para>The currently recognized URI types are cdrom, file, http, ftp, copy,
- ssh, rsh.
+ <para>The currently recognized URI types are:
<variablelist>
- <varlistentry><term>file</term>
+ <varlistentry><term><command>file</command></term>
<listitem><para>
The file scheme allows an arbitrary directory in the file system to be
considered an archive. This is useful for NFS mounts and local mirrors or
archives.</para></listitem>
</varlistentry>
- <varlistentry><term>cdrom</term>
+ <varlistentry><term><command>cdrom</command></term>
<listitem><para>
The cdrom scheme allows APT to use a local CDROM drive with media
swapping. Use the &apt-cdrom; program to create cdrom entries in the
source list.</para></listitem>
</varlistentry>
- <varlistentry><term>http</term>
+ <varlistentry><term><command>http</command></term>
<listitem><para>
The http scheme specifies an HTTP server for the archive. If an environment
variable <envar>http_proxy</envar> is set with the format
@@ -168,7 +167,7 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
Note that this is an insecure method of authentication.</para></listitem>
</varlistentry>
- <varlistentry><term>ftp</term>
+ <varlistentry><term><command>ftp</command></term>
<listitem><para>
The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
is highly configurable; for more information see the
@@ -179,14 +178,14 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
the configuration file will be ignored.</para></listitem>
</varlistentry>
- <varlistentry><term>copy</term>
+ <varlistentry><term><command>copy</command></term>
<listitem><para>
The copy scheme is identical to the file scheme except that packages are
copied into the cache directory instead of used directly at their location.
This is useful for people using a zip disk to copy files around with APT.</para></listitem>
</varlistentry>
- <varlistentry><term>rsh</term><term>ssh</term>
+ <varlistentry><term><command>rsh</command></term><term><command>ssh</command></term>
<listitem><para>
The rsh/ssh method invokes rsh/ssh to connect to a remote host
as a given user and access the files. It is a good idea to do prior
@@ -196,15 +195,13 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
commands to perform the file transfers from the remote.</para></listitem>
</varlistentry>
- <varlistentry><term>more recognizable URI types</term>
+ <varlistentry><term>adding 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. maintains also the <literal>apt-transport-https</literal> package which
+ follow the nameing scheme <package>apt-transport-<replaceable>method</replaceable></package>.
+ The APT team e.g. maintains also the <package>apt-transport-https</package> package which
provides access methods for https-URIs with features similar 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>.
+ methods for using e.g. debtorrent are also available, see &apt-transport-debtorrent;.
</para></listitem>
</varlistentry>
</variablelist>