summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore1
-rw-r--r--cmdline/apt-get.cc3
-rw-r--r--debian/apt-utils.links1
-rw-r--r--debian/changelog43
-rw-r--r--doc/apt-cdrom.8.xml20
-rw-r--r--doc/apt-config.8.xml20
-rw-r--r--doc/apt-extracttemplates.1.xml4
-rw-r--r--doc/apt-get.8.xml103
-rw-r--r--doc/apt-mark.8.xml2
-rw-r--r--doc/apt-verbatim.ent7
-rw-r--r--doc/apt.conf.5.xml6
-rw-r--r--doc/dpkg-tech.sgml2
-rw-r--r--doc/examples/configure-index2
-rw-r--r--doc/examples/sources.list9
-rw-r--r--doc/examples/sources.list.in8
-rw-r--r--doc/guide.sgml6
-rw-r--r--doc/makefile3
-rw-r--r--doc/method.sgml4
-rw-r--r--doc/po/apt-doc.pot263
-rw-r--r--doc/po/de.po388
-rw-r--r--doc/po/es.po372
-rw-r--r--doc/po/fr.po365
-rw-r--r--doc/po/it.po267
-rw-r--r--doc/po/ja.po399
-rw-r--r--doc/po/pl.po1687
-rw-r--r--doc/po/pt.po389
-rw-r--r--doc/po/pt_BR.po267
-rw-r--r--doc/po4a.conf4
-rw-r--r--doc/sources.list.5.xml2
-rwxr-xr-xprepare-release1
30 files changed, 1860 insertions, 2788 deletions
diff --git a/.bzrignore b/.bzrignore
index dab38cf71..6dcdc8eb5 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -26,4 +26,5 @@ abicheck/tests/
# apt man pages and other documentation
./doc/*/
!./doc/examples/
+./doc/examples/sources.list
!./doc/po/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c996017b8..6ef046089 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -254,6 +254,9 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList)
*/
void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
{
+ if (Cache->BrokenCount() == 0)
+ return;
+
out << _("The following packages have unmet dependencies:") << endl;
for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
{
diff --git a/debian/apt-utils.links b/debian/apt-utils.links
deleted file mode 100644
index 5bf138c4a..000000000
--- a/debian/apt-utils.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/apt-internal-solver usr/lib/apt/solvers/apt
diff --git a/debian/changelog b/debian/changelog
index 1547e5d35..d09239de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,43 @@
apt (0.9.5.2) UNRELEASED; urgency=low
- [ Translation of manpages ]
- * Polish updated by Robert Luberda. Closes: #675603
- * French updated by Christian Perrier
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - do not show 'list of broken packages' header if no package
+ is broken as it happens e.g. for external resolver errors
+ * debian/apt-utils.links:
+ - the internal resolver 'apt' is now directly installed in
+ /usr/lib/apt/solvers, so don't instruct dh to create a broken link
+ * doc/apt-verbatim.ent:
+ - APT doesn't belong to the product 'Linux', so use 'APT' instead
+ as after all APT is a big suite of applications
+ * doc/examples/sources.list:
+ - use the codename instead of 'stable' in the examples sources.list
+ as we do in the manpage and as the debian-installer does
+ * doc/apt-get.8.xml:
+ - use apt-utils as package example instead of libc6
+
+ [ Justin B Rye ]
+ * doc/apt-cdrom.8.xml:
+ - replace CDROM with the proper CD-ROM in text
+ - correct disc vs. disk issues
+ * doc/apt-config.8.xml:
+ - review and fix spelling issues
+ * doc/apt-extracttemplates.1.xml:
+ - debconf is not DebConf
+ * doc/apt-get.8.xml:
+ - move dselect-upgrade below dist-upgrade
+ - review and fix spelling issues
- [ Translation of programs ]
- * Danish by Joe Hansen. Closes: #675605
- * French updated by Christian Perrier
+ [ Robert Luberda ]
+ * Polish manpage translation update (Closes: #675603)
+ * doc/apt-mark.8.xml:
+ - in hold, the option name is --file not --filename
+
+ [ Christian Perrier ]
+ * French program and manpage translation update
+ * Danish program translation by Joe Hansen. Closes: #675605
- -- Christian Perrier <bubulle@debian.org> Sat, 02 Jun 2012 18:25:18 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 24 May 2012 19:40:58 +0200
apt (0.9.5.1) unstable; urgency=low
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 1dd552496..c73fb8151 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -29,13 +29,13 @@
<!-- Man page title -->
<refnamediv>
<refname>apt-cdrom</refname>
- <refpurpose>APT CDROM management utility</refpurpose>
+ <refpurpose>APT CD-ROM management utility</refpurpose>
</refnamediv>
&synopsis-command-apt-cdrom;
<refsect1><title>Description</title>
- <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list
+ <para><command>apt-cdrom</command> is used to add a new CD-ROM to APT's list
of available sources. <command>apt-cdrom</command> takes care of
determining the structure of
the disc as well as correcting for several possible mis-burns and
@@ -43,8 +43,8 @@
</para>
<para>It is necessary to use <command>apt-cdrom</command> to add CDs to the
- APT system,
- it cannot be done by hand. Furthermore each disk in a multi-cd set must be
+ APT system;
+ it cannot be done by hand. Furthermore each disc in a multi-CD set must be
inserted and scanned separately to account for possible mis-burns.
</para>
@@ -55,13 +55,13 @@
<varlistentry><term><option>add</option></term>
<listitem><para><literal>add</literal> is used to add a new disc to the
source list. It will unmount the
- CDROM device, prompt for a disk to be inserted and then proceed to
+ CD-ROM device, prompt for a disc to be inserted and then proceed to
scan it and copy the index files. If the disc does not have a proper
- <filename>disk</filename> directory you will be prompted for a descriptive
+ <filename>.disk</filename> directory you will be prompted for a descriptive
title.
</para>
- <para>APT uses a CDROM ID to track which disc is currently in the drive and
+ <para>APT uses a CD-ROM ID to track which disc is currently in the drive and
maintains a database of these IDs in
<filename>&statedir;/cdroms.list</filename>
</para>
@@ -82,7 +82,7 @@
<variablelist>
<varlistentry><term><option>-d</option></term><term><option>--cdrom</option></term>
- <listitem><para>Mount point; specify the location to mount the cdrom. This
+ <listitem><para>Mount point; specify the location to mount the CD-ROM. This
mount point must be listed in <filename>/etc/fstab</filename> and
properly configured.
Configuration Item: <literal>Acquire::cdrom::mount</literal>.
@@ -91,8 +91,8 @@
</varlistentry>
<varlistentry><term><option>-r</option></term><term><option>--rename</option></term>
- <listitem><para>Rename a disc; change the label of a disk or override the
- disks given label. This option will cause <command>apt-cdrom</command> to
+ <listitem><para>Rename a disc; change the label of a disc or override the
+ disc's given label. This option will cause <command>apt-cdrom</command> to
prompt for a new label.
Configuration Item: <literal>APT::CDROM::Rename</literal>.
</para>
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index a7164b4e7..dc585cfb2 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -39,7 +39,7 @@
<para><command>apt-config</command> is an internal program used by various
portions of the APT suite to provide consistent configurability. It accesses
the main configuration file <filename>/etc/apt/apt.conf</filename> in a
- manner that is easy to use by scripted applications.</para>
+ manner that is easy to use for scripted applications.</para>
<para>Unless the <option>-h</option>, or <option>--help</option> option is
given, one of the commands below must be present.
@@ -48,11 +48,11 @@
<variablelist>
<varlistentry><term><option>shell</option></term>
<listitem><para>
- shell is used to access the configuration information from a shell
- script. It is given pairs of arguments, the first being a shell
- variable and the second the configuration value to query. As output
- it lists a series of shell assignments commands for each present value.
- In a shell script it should be used like:
+ shell is used to access the configuration information from a shell
+ script. It is given pairs of arguments, the first being a shell
+ variable and the second the configuration value to query. As output
+ it lists shell assignment commands for each value present.
+ In a shell script it should be used as follows:
</para>
<informalexample><programlisting>
@@ -93,11 +93,11 @@ eval $RES
<varlistentry>
<term><option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option></term>
- <listitem><para>Defines the output of each config option. &percnt;t will be replaced with the name of the option,
- &percnt;f with the complete optionname and &percnt;v with the value of the option.
+ <listitem><para>Defines the output of each config option. &percnt;t will be replaced with its individual name,
+ &percnt;f with its full hierarchical name and &percnt;v with its value.
Use uppercase letters and special characters in the value will be encoded to ensure that
- it can e.g. be savely used in a quoted-string as defined by RFC822. Additionally
- &percnt;n will be replaced by a newline, &percnt;N by a tab. A &percnt; can be
+ it can e.g. be safely used in a quoted-string as defined by RFC822. Additionally
+ &percnt;n will be replaced by a newline, and &percnt;N by a tab. A &percnt; can be
printed by using &percnt;&percnt;.</para></listitem>
</varlistentry>
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 7d0f0bfea..5c4dd81d0 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -30,7 +30,7 @@
<!-- Man page title -->
<refnamediv>
<refname>apt-extracttemplates</refname>
- <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose>
+ <refpurpose>Utility to extract <command>debconf</command> config and templates from Debian packages</refpurpose>
</refnamediv>
&synopsis-command-apt-extracttemplates;
@@ -55,7 +55,7 @@
<variablelist>
<varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
<listitem><para>
- Temporary directory in which to write extracted debconf template files
+ Temporary directory in which to write extracted <command>debconf</command> template files
and config scripts.
Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
</varlistentry>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 620d22106..5fef807e2 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -70,37 +70,37 @@
available.</para></listitem>
</varlistentry>
- <varlistentry><term><option>dselect-upgrade</option></term>
- <listitem><para><literal>dselect-upgrade</literal>
- is used in conjunction with the traditional Debian packaging
- front-end, &dselect;. <literal>dselect-upgrade</literal>
- follows the changes made by &dselect; to the <literal>Status</literal>
- field of available packages, and performs the actions necessary to realize
- that state (for instance, the removal of old and the installation of new
- packages).</para></listitem>
- </varlistentry>
-
<varlistentry><term><option>dist-upgrade</option></term>
<listitem><para><literal>dist-upgrade</literal> in addition to performing the function of
<literal>upgrade</literal>, also intelligently handles changing dependencies
with new versions of packages; <command>apt-get</command> has a "smart" conflict
resolution system, and it will attempt to upgrade the most important
packages at the expense of less important ones if necessary.
- So, <literal>dist-upgrade</literal> command may remove some packages.
+ The <literal>dist-upgrade</literal> command may therefore remove some packages.
The <filename>/etc/apt/sources.list</filename> file contains a list of locations
from which to retrieve desired package files.
See also &apt-preferences; for a mechanism for
overriding the general settings for individual packages.</para></listitem>
</varlistentry>
+ <varlistentry><term><option>dselect-upgrade</option></term>
+ <listitem><para><literal>dselect-upgrade</literal>
+ is used in conjunction with the traditional Debian packaging
+ front-end, &dselect;. <literal>dselect-upgrade</literal>
+ follows the changes made by &dselect; to the <literal>Status</literal>
+ field of available packages, and performs the actions necessary to realize
+ that state (for instance, the removal of old and the installation of new
+ packages).</para></listitem>
+ </varlistentry>
+
<varlistentry><term><option>install</option></term>
<listitem>
<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 system,
- libc6 would be the argument provided, not
- <literal>libc6_1.9.6-2.deb</literal>). All packages required
+ <package>apt-utils</package> would be the argument provided, not
+ <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). 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
@@ -149,8 +149,8 @@
<varlistentry><term><option>remove</option></term>
<listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are
- removed instead of installed. Note the removing a package leaves its
- configuration files in system. If a plus sign is appended to the package
+ removed instead of installed. Note that removing a package leaves its
+ configuration files on the system. If a plus sign is appended to the package
name (with no intervening space), the identified package will be
installed instead of removed.</para></listitem>
</varlistentry>
@@ -170,11 +170,10 @@
<literal>pkg/release</literal> syntax, if possible.</para>
<para>Source packages are tracked separately
- from binary packages via <literal>deb-src</literal> type lines
+ from binary packages via <literal>deb-src</literal> lines
in the &sources-list; file. This means that you will need to add such a line
- for each repository you want to get sources from. If you don't do this
- you will properly get another (newer, older or none) source version than
- the one you have installed or could install.</para>
+ for each repository you want to get sources from; otherwise you will probably
+ get either the wrong (too old/too new) source versions or none at all.</para>
<para>If the <option>--compile</option> option is specified
then the package will be compiled to a binary .deb using
@@ -188,10 +187,10 @@
used for the package files. This enables exact matching of the source
package name and version, implicitly enabling the
<literal>APT::Get::Only-Source</literal> option.</para>
-
- <para>Note that source packages are not tracked like binary packages, they
- exist only in the current directory and are similar to downloading source
- tar balls.</para></listitem>
+
+ <para>Note that source packages are not installed and tracked in the
+ <command>dpkg</command> database like binary packages; they are simply downloaded
+ to the current directory, like source tarballs.</para></listitem>
</varlistentry>
<varlistentry><term><option>build-dep</option></term>
@@ -241,7 +240,7 @@
<listitem><para><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 url="http://packages.debian.org/changelogs">packages.debian.org/changelogs</ulink> for
+ variable (e.g. <ulink url="http://packages.debian.org/changelogs">packages.debian.org/changelogs</ulink> for
Debian or <ulink url="http://changelogs.ubuntu.com/changelogs">changelogs.ubuntu.com/changelogs</ulink> for
Ubuntu).
By default it displays the changelog for the version that is
@@ -291,7 +290,7 @@
<varlistentry><term><option>-m</option></term><term><option>--ignore-missing</option></term>
<term><option>--fix-missing</option></term>
- <listitem><para>Ignore missing packages; If packages cannot be retrieved or fail the
+ <listitem><para>Ignore missing packages; if packages cannot be retrieved or fail the
integrity check after retrieval (corrupted package files), hold back
those packages and handle the result. Use of this option together with
<option>-f</option> may produce an error in some situations. If a package is
@@ -312,9 +311,9 @@
<listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
More q's will produce more quiet up to a maximum of 2. You can also use
<option>-q=#</option> to set the quiet level, overriding the configuration file.
- Note that quiet level 2 implies <option>-y</option>, you should never use -qq
+ Note that quiet level 2 implies <option>-y</option>; you should never use -qq
without a no-action modifier such as -d, --print-uris or -s as APT may
- decided to do something you did not expect.
+ decide to do something you did not expect.
Configuration Item: <literal>quiet</literal>.</para></listitem>
</varlistentry>
@@ -328,17 +327,18 @@
actually change the system.
Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
- <para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>)
- automatic. Also a notice will be displayed indicating that this is only a simulation,
- if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true).
- Neither NoLocking nor the notice will be triggered if run as root (root should know what
- he is doing without further warnings by <literal>apt-get</literal>).</para>
+ <para>Simulated runs performed as a user will automatically deactivate locking
+ (<literal>Debug::NoLocking</literal>), and if the option
+ <literal>APT::Get::Show-User-Simulation-Note</literal> is set
+ (as it is by default) a notice will also be displayed indicating that
+ this is only a simulation. Runs performed as root do not trigger either
+ NoLocking or the notice - superusers should know what they are doing
+ without further warnings from <literal>apt-get</literal>.</para>
- <para>Simulate prints out
- a series of lines each one representing a dpkg operation, Configure (Conf),
- Remove (Remv), Unpack (Inst). Square brackets indicate broken packages
- and empty set of square brackets meaning breaks that are of no consequence
- (rare).</para></listitem>
+ <para>Simulated runs print out a series of lines, each representing a <command>dpkg</command>
+ operation: configure (<literal>Conf</literal>), remove (<literal>Remv</literal>)
+ or unpack (<literal>Inst</literal>). Square brackets indicate broken packages, and
+ empty square brackets indicate breaks that are of no consequence (rare).</para></listitem>
</varlistentry>
<varlistentry><term><option>-y</option></term><term><option>--yes</option></term>
@@ -356,7 +356,7 @@
</varlistentry>
<varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term>
- <listitem><para>Show upgraded packages; Print out a list of all packages that are to be
+ <listitem><para>Show upgraded packages; print out a list of all packages that are to be
upgraded.
Configuration Item: <literal>APT::Get::Show-Upgraded</literal>.</para></listitem>
</varlistentry>
@@ -383,21 +383,21 @@
</varlistentry>
<varlistentry><term><option>--ignore-hold</option></term>
- <listitem><para>Ignore package Holds; This causes <command>apt-get</command> to ignore a hold
+ <listitem><para>Ignore package holds; this causes <command>apt-get</command> to ignore a hold
placed on a package. This may be useful in conjunction with
<literal>dist-upgrade</literal> to override a large number of undesired holds.
Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem>
</varlistentry>
<varlistentry><term><option>--no-upgrade</option></term>
- <listitem><para>Do not upgrade packages; When used in conjunction with <literal>install</literal>,
+ <listitem><para>Do not upgrade packages; when used in conjunction with <literal>install</literal>,
<literal>no-upgrade</literal> will prevent packages on the command line
from being upgraded if they are already installed.
Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem>
</varlistentry>
<varlistentry><term><option>--only-upgrade</option></term>
- <listitem><para>Do not install new packages; When used in conjunction
+ <listitem><para>Do not install new packages; when used in conjunction
with <literal>install</literal>, <literal>only-upgrade</literal> will
install upgrades for already installed packages only and ignore requests
to install new packages.
@@ -405,7 +405,7 @@
</varlistentry>
<varlistentry><term><option>--force-yes</option></term>
- <listitem><para>Force yes; This is a dangerous option that will cause apt to continue
+ <listitem><para>Force yes; this is a dangerous option that will cause apt to continue
without prompting if it is doing something potentially harmful. It
should not be used except in very special situations. Using
<literal>force-yes</literal> can potentially destroy your system!
@@ -415,7 +415,7 @@
<varlistentry><term><option>--print-uris</option></term>
<listitem><para>Instead of fetching the files to install their URIs are printed. Each
URI will have the path, the destination file name, the size and the expected
- md5 hash. Note that the file name to write to will not always match
+ MD5 hash. Note that the file name to write to will not always match
the file name on the remote site! This also works with the
<literal>source</literal> and <literal>update</literal> commands. When used with the
<literal>update</literal> command the MD5 and size are not included, and it is
@@ -432,23 +432,22 @@
</varlistentry>
<varlistentry><term><option>--reinstall</option></term>
- <listitem><para>Re-Install packages that are already installed and at the newest version.
+ <listitem><para>Re-install packages that are already installed and at the newest version.
Configuration Item: <literal>APT::Get::ReInstall</literal>.</para></listitem>
</varlistentry>
<varlistentry><term><option>--list-cleanup</option></term>
- <listitem><para>This option defaults to on, use <literal>--no-list-cleanup</literal> to turn it
- off. When on <command>apt-get</command> will automatically manage the contents of
- <filename>&statedir;/lists</filename> to ensure that obsolete files are erased.
- The only reason to turn it off is if you frequently change your source
- list.
+ <listitem><para>This option is on by default; use <literal>--no-list-cleanup</literal> to turn
+ it off. When it is on, <command>apt-get</command> will automatically manage the contents
+ of <filename>&statedir;/lists</filename> to ensure that obsolete files are erased.
+ The only reason to turn it off is if you frequently change your sources list.
Configuration Item: <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
</varlistentry>
<varlistentry><term><option>-t</option></term>
<term><option>--target-release</option></term>
<term><option>--default-release</option></term>
- <listitem><para>This option controls the default input to the policy engine, it creates
+ <listitem><para>This option controls the default input to the policy engine; it creates
a default pin at priority 990 using the specified release string.
This overrides the general settings in <filename>/etc/apt/preferences</filename>.
Specifically pinned packages are not affected by the value
@@ -464,7 +463,7 @@
<varlistentry><term><option>--trivial-only</option></term>
<listitem><para>
Only perform operations that are 'trivial'. Logically this can be considered
- related to <option>--assume-yes</option>, where <option>--assume-yes</option> will answer
+ related to <option>--assume-yes</option>; where <option>--assume-yes</option> will answer
yes to any prompt, <option>--trivial-only</option> will answer no.
Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem>
</varlistentry>
@@ -477,7 +476,7 @@
<varlistentry><term><option>--auto-remove</option></term>
<listitem><para>If the command is either <literal>install</literal> or <literal>remove</literal>,
- then this option acts like running <literal>autoremove</literal> command, removing the unused
+ then this option acts like running the <literal>autoremove</literal> command, removing unused
dependency packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>.
</para></listitem>
</varlistentry>
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 8f289c49a..8ef8e4ff3 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -70,7 +70,7 @@
automatically installed, upgraded or removed.
The command is only a wrapper around <command>dpkg --set-selections</command>
and the state is therefore maintained by &dpkg; and not effected
- by the <option>--filename</option> option.
+ by the <option>--file</option> option.
</para></listitem>
</varlistentry>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index ff37f4ae7..617403116 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -202,15 +202,18 @@
">
<!ENTITY apt-product "
- <productname>Linux</productname>
+ <productname>APT</productname>
+ <releaseinfo role='version'>&apt-product-version;</releaseinfo>
">
+<!-- this will be updated by 'prepare-release' -->
+<!ENTITY apt-product-version "0.9.5.1">
+
<!-- Codenames for debian releases -->
<!ENTITY oldstable-codename "lenny">
<!ENTITY stable-codename "squeeze">
<!ENTITY testing-codename "wheezy">
-
<!-- Arguments -->
<!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
<!ENTITY synopsis-arg-config "<arg><option>-c=<filename><replaceable>&synopsis-config-file;</replaceable></filename></option></arg>">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index bb538c660..299cc7b2a 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -427,8 +427,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</varlistentry>
<varlistentry><term><option>cdrom</option></term>
- <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point,
- <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive
+ <listitem><para>CD-ROM URIs; the only setting for CD-ROM URIs is the mount point,
+ <literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM drive
as specified in <filename>/etc/fstab</filename>. It is possible to provide
alternate mount and unmount commands if your mount point cannot be listed
in the fstab (such as an SMB mount and old mount packages). The syntax
@@ -773,7 +773,7 @@ DPkg::TriggersPending "true";</literallayout></para>
<listitem>
<para>
<literal>Debug::IdentCdrom</literal> disables the inclusion
- of statfs data in CDROM IDs. <!-- TODO: provide a
+ of statfs data in CD-ROM IDs. <!-- TODO: provide a
motivating example, except I haven't a clue why you'd want
to do this. -->
</para>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index d377a35dc..1a15f6a4c 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -164,7 +164,7 @@ not copied into here; it is instead found as part of status or available.
<item>methods - this directory is reserved for "method"-specific files - each
"method" has a subdirectory underneath this directory (or at least, it can
have). In addition, there is another subdirectory "mnt", where misc.
-filesystems (floppies, CDROMs, etc.) are mounted.
+filesystems (floppies, CD-ROMs, etc.) are mounted.
<item>alternatives - directory used by the "update-alternatives" program. It
contains one file for each "alternatives" interface, which contains information
about all the needed symlinked files for each alternative.
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 49e803f91..f75b5738a 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,7 +90,7 @@ APT
Authentication
{
- TrustCDROM "false"; // consider the CDROM always trusted
+ TrustCDROM "false"; // consider the CD-ROM always trusted
};
// Some general options
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
deleted file mode 100644
index ef729e203..000000000
--- a/doc/examples/sources.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# See sources.list(5) for more information, especialy
-# Remember that you can only use http, ftp or file URIs
-# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
-
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://security.debian.org stable/updates main contrib non-free
diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in
new file mode 100644
index 000000000..745e32cbe
--- /dev/null
+++ b/doc/examples/sources.list.in
@@ -0,0 +1,8 @@
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
+deb http://security.debian.org &stable-codename;/updates main contrib non-free
+
+# Uncomment if you want the apt-get source function to work
+#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
+#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free
diff --git a/doc/guide.sgml b/doc/guide.sgml
index 8d762b6f3..747c5718c 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -174,11 +174,11 @@ select the packages to be installed or removed and APT actually installs them.
To enable the APT method you need to select [A]ccess in <prgn>dselect</>
and then choose the APT method. You will be prompted for a set of
<em>Sources</> which are places to fetch archives from. These can be remote
-Internet sites, local Debian mirrors or CDROMs. Each source can provide
+Internet sites, local Debian mirrors or CD-ROMs. Each source can provide
a fragment of the total Debian archive, APT will automatically combine them
-to form a complete set of packages. If you have a CDROM then it is a good idea
+to form a complete set of packages. If you have a CD-ROM then it is a good idea
to specify it first and then specify a mirror so that you have access to
-the latest bug fixes. APT will automatically use packages on your CDROM before
+the latest bug fixes. APT will automatically use packages on your CD-ROM before
downloading from the Internet.
<p>
diff --git a/doc/makefile b/doc/makefile
index 7b49ac269..220a6160d 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -56,6 +56,9 @@ endif
SOURCE = apt.8
include $(MANPAGE_H)
+examples/sources.list: examples/sources.list.in apt-verbatim.ent
+ sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+
# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
TO = $(DOC)
diff --git a/doc/method.sgml b/doc/method.sgml
index 3bee47d3a..27db50173 100644
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -220,7 +220,7 @@ the ones it wants.
<tag>Local<item>The method only returns Filename: fields.
<tag>Send-Config<item>Send configuration to the method.
<tag>Needs-Cleanup<item>The process is kept around while the files it returned
-are being used. This is primarily intended for CDROM and File URIs that need
+are being used. This is primarily intended for CD-ROM and File URIs that need
to unmount filesystems.
<tag>Version<item>Version string for the method
</taglist>
@@ -318,7 +318,7 @@ Fields: Media, Fail
<p>
The methods supplied by the stock apt are:
<enumlist>
-<item>cdrom - For Multi-Disc CDROMs
+<item>cdrom - For Multi-Disc CD-ROMs
<item>copy - (internal) For copying files around the filesystem
<item>file - For local files
<item>gzip - (internal) For decompression
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a723feb8e..6adb824b5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-24 17:24+0300\n"
+"POT-Creation-Date: 2012-06-02 19:24+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"
@@ -935,7 +935,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
@@ -1043,12 +1043,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 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
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
-#: apt-cache.8.xml:350 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
+#: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528 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 ""
@@ -1058,7 +1058,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:355 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
+#: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
@@ -1071,13 +1071,13 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible "
"mis-burns and verifying the index files."
@@ -1087,7 +1087,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
@@ -1095,16 +1095,16 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in "
"<filename>&statedir;/cdroms.list</filename>"
msgstr ""
@@ -1124,7 +1124,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1132,7 +1132,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:94
msgid ""
-"Rename a disc; change the label of a disk or override the disks given "
+"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
@@ -1193,7 +1193,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1201,9 +1201,9 @@ msgstr ""
msgid ""
"shell is used to access the configuration information from a shell "
"script. It is given pairs of arguments, the first being a shell variable and "
-"the second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"the second the configuration value to query. As output it lists shell "
+"assignment commands for each value present. In a shell script it should be "
+"used as follows:"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
@@ -1251,12 +1251,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using "
-"&percnt;&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1278,7 +1277,9 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1309,8 +1310,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: "
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: "
"<literal>APT::ExtractTemplates::TempDir</literal>"
msgstr ""
@@ -2084,6 +2085,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
+"<literal>dist-upgrade</literal> in addition to performing the function of "
+"<literal>upgrade</literal>, also intelligently handles changing dependencies "
+"with new versions of packages; <command>apt-get</command> has a \"smart\" "
+"conflict resolution system, and it will attempt to upgrade the most "
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also "
+"&apt-preferences; for a mechanism for overriding the general settings for "
+"individual packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, "
"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by "
@@ -2093,33 +2109,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
-"<literal>dist-upgrade</literal> in addition to performing the function of "
-"<literal>upgrade</literal>, also intelligently handles changing dependencies "
-"with new versions of packages; <command>apt-get</command> has a \"smart\" "
-"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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, "
+"<package>apt-utils</package> would be the argument provided, not "
+"<filename>apt-utils_&apt-product-version;_amd64.deb</filename>). 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>
@@ -2175,9 +2178,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
@@ -2205,15 +2208,14 @@ msgstr ""
#: apt-get.8.xml:172
msgid ""
"Source packages are tracked separately from binary packages via "
-"<literal>deb-src</literal> type lines in the &sources-list; file. This means "
-"that you will need to add such a line for each repository you want to get "
-"sources from. If you don't do this you will properly get another (newer, "
-"older or none) source version than the one you have installed or could "
-"install."
+"<literal>deb-src</literal> lines in the &sources-list; file. This means that "
+"you will need to add such a line for each repository you want to get sources "
+"from; otherwise you will probably get either the wrong (too old/too new) "
+"source versions or none at all."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2223,7 +2225,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2233,15 +2235,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
@@ -2251,21 +2253,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2277,7 +2279,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2289,7 +2291,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for other packages and are "
@@ -2297,12 +2299,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 "
+"variable (e.g. <ulink "
"url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
"for Debian or <ulink "
"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
@@ -2312,28 +2314,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -2349,9 +2351,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with "
"<option>-f</option> may produce an error in some situations. If a package is "
@@ -2361,7 +2363,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -2370,19 +2372,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: "
@@ -2390,24 +2392,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:330
msgid ""
-"Simulation run as user will deactivate locking "
-"(<literal>Debug::NoLocking</literal>) automatic. Also a notice will be "
-"displayed indicating that this is only a simulation, if the option "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: "
-"true). Neither NoLocking nor the notice will be triggered if run as root "
-"(root should know what he is doing without further warnings by "
-"<literal>apt-get</literal>)."
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option "
+"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is by "
+"default) a notice will also be displayed indicating that this is only a "
+"simulation. Runs performed as root do not trigger either NoLocking or the "
+"notice - superusers should know what they are doing without further warnings "
+"from <literal>apt-get</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack "
+"(<literal>Inst</literal>). Square brackets indicate broken packages, and "
+"empty square brackets indicate breaks that are of no consequence (rare)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2430,7 +2433,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
@@ -2462,7 +2465,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -2471,7 +2474,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with "
+"Do not upgrade packages; when used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
"packages on the command line from being upgraded if they are already "
"installed. Configuration Item: <literal>APT::Get::Upgrade</literal>."
@@ -2480,7 +2483,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
msgid ""
-"Do not install new packages; When used in conjunction with "
+"Do not install new packages; when used in conjunction with "
"<literal>install</literal>, <literal>only-upgrade</literal> will install "
"upgrades for already installed packages only and ignore requests to install "
"new packages. Configuration Item: "
@@ -2490,7 +2493,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using "
"<literal>force-yes</literal> can potentially destroy your system! "
@@ -2501,7 +2504,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the "
@@ -2523,25 +2526,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: "
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: "
"<literal>APT::Get::List-Cleanup</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in "
"<filename>/etc/apt/preferences</filename>. Specifically pinned packages are "
@@ -2554,33 +2557,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where "
+"related to <option>--assume-yes</option>; where "
"<option>--assume-yes</option> will answer yes to any prompt, "
"<option>--trivial-only</option> will answer no. Configuration Item: "
"<literal>APT::Get::Trivial-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or "
-"<literal>remove</literal>, then this option acts like running "
-"<literal>autoremove</literal> command, removing the unused dependency "
+"<literal>remove</literal>, then this option acts like running the "
+"<literal>autoremove</literal> command, removing unused dependency "
"packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -2592,7 +2595,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -2601,14 +2604,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: "
@@ -2616,7 +2619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -2624,7 +2627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -2807,7 +2810,7 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg "
"--set-selections</command> and the state is therefore maintained by &dpkg; "
-"and not effected by the <option>--filename</option> option."
+"and not effected by the <option>--file</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3712,8 +3715,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -4255,7 +4258,7 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -5643,7 +5646,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
"list."
msgstr ""
@@ -6086,12 +6089,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
#. type: <example></example>
diff --git a/doc/po/de.po b/doc/po/de.po
index bf582cbdb..8b2021eb2 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+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"
@@ -1229,7 +1229,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "Optionen"
@@ -1386,14 +1386,14 @@ msgstr ""
"<literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1407,7 +1407,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnose"
@@ -1423,13 +1423,13 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "APT-CDROM-Verwaltungswerkzeug"
+msgid "APT CD-ROM management utility"
+msgstr "APT-CD-ROM-Verwaltungswerkzeug"
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
@@ -1443,7 +1443,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"Es ist notwendig, <command>apt-cdrom</command> zu benutzen, um CDs zum APT-"
@@ -1455,21 +1455,21 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
"<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste "
"hinzuzufügen. Es wird das CD-ROM-Gerät aushängen, verlangen, dass ein Medium "
"eingelegt wird und dann mit den Einlesen und Kopieren der Indexdateien "
-"fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-"
+"fortfahren. Wenn das Medium kein angemessenes <filename>.disk</filename>-"
"Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
@@ -1494,7 +1494,7 @@ msgstr "Optionen"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1506,9 +1506,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
"ein Medium umbenennen. Ändert den Namen eines Mediums oder überschreibt den "
"Namen, der dem Medium gegeben wurde. Diese Option wird <command>apt-cdrom</"
@@ -1586,7 +1586,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
"<command>apt-config</command> ist ein internes Programm, das von vielen "
"Teilen des APT-Pakets benutzt wird, um durchgängige Konfigurierbarkeit "
@@ -1596,12 +1596,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value. In a shell "
+#| "script it should be used like:"
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
"shell wird benutzt, um aus einem Shellskript auf Konfigurationsinformationen "
"zuzugreifen. Es wird ein Paar aus Argumenten angegeben – das erste als Shell-"
@@ -1663,14 +1670,22 @@ msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "Defines the output of each config option. &percnt;t will be replaced with "
+#| "the name of the option, &percnt;f with the complete optionname and "
+#| "&percnt;v with the value of the option. Use uppercase letters and "
+#| "special characters in the value will be encoded to ensure that it can e."
+#| "g. be savely used in a quoted-string as defined by RFC822. Additionally "
+#| "&percnt;n will be replaced by a newline, &percnt;N by a tab. A &percnt; "
+#| "can be printed by using &percnt;&percnt;."
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
"definiert die Ausgabe jeder Option. &percnt;t wird durch den Namen der "
"Option ersetzt, &percnt;f durch den kompletten Optionsnamen und &percnt;v "
@@ -1703,10 +1718,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Hilfsprogramm zum Extrahieren der DebConf-Konfiguration und Schablonen von "
-"Debian-Paketen"
+"Hilfsprogramm zum Extrahieren der <command>debconf</command>-Konfiguration "
+"und Schablonen von Debian-Paketen"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1747,13 +1764,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
-"temporäres Verzeichnis, in das die extrahierten DebConf-Schablonendateien "
-"und Konfigurationsdateien geschrieben werden. Konfigurationselement: "
-"<literal>APT::ExtractTemplates::TempDir</literal>"
+"temporäres Verzeichnis, in das die extrahierten <command>debconf</command>-"
+"Schablonendateien und Konfigurationsdateien geschrieben werden. "
+"Konfigurationselement: <literal>APT::ExtractTemplates::TempDir</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2810,32 +2827,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> wird zusammen mit der traditionellen "
-"Debian-Oberfläche &dselect; benutzt. <literal>dselect-upgrade</literal> "
-"folgt den durch &dselect; am <literal>Status</literal>-Feld verfügbarer "
-"Pakete gemachten Änderungen und führt die notwendigen Aktionen durch, um "
-"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
-"Installieren von neuen Paketen)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
"<literal>dist-upgrade</literal> führt zusätzlich zu der Funktion von "
"<literal>upgrade</literal> intelligente Handhabung von "
@@ -2849,16 +2850,34 @@ msgstr ""
"überschreiben der allgemeinen Einstellungen für einzelne Pakete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> wird zusammen mit der traditionellen "
+"Debian-Oberfläche &dselect; benutzt. <literal>dselect-upgrade</literal> "
+"folgt den durch &dselect; am <literal>Status</literal>-Feld verfügbarer "
+"Pakete gemachten Änderungen und führt die notwendigen Aktionen durch, um "
+"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
+"Installieren von neuen Paketen)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2866,16 +2885,17 @@ 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«-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 "
-"benutzt, um die gewünschten Pakete zu finden. Wenn ein Bindestrich an den "
-"Paketnamen (ohne Leerzeichen dazwischen) angehängt ist, wird das erkannte "
-"Pakete entfernt, falls es installiert ist. Ähnlich kann ein Pluszeichen "
-"benutzt werden, um ein Paket zum Installieren vorzumerken. Diese letzteren "
-"Funktionen können benutzt werden, um Entscheidungen zu überschreiben, die "
-"vom Konfliktauflösungssystem von apt-get getroffen wurden."
+"»Debian«-System <package>apt-utils</package> das bereitgestellte Argument, "
+"nicht <filename>apt-utils_&apt-product-version;_amd64.deb</filename>). 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 benutzt, um die gewünschten Pakete zu finden. "
+"Wenn ein Bindestrich an den Paketnamen (ohne Leerzeichen dazwischen) "
+"angehängt ist, wird das erkannte Pakete entfernt, falls es installiert ist. "
+"Ähnlich kann ein Pluszeichen benutzt werden, um ein Paket zum Installieren "
+"vorzumerken. Diese letzteren Funktionen können benutzt werden, um "
+"Entscheidungen zu überschreiben, die vom Konfliktauflösungssystem von apt-"
+"get getroffen wurden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:116
@@ -2958,9 +2978,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
@@ -3002,12 +3022,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:172
+#, fuzzy
+#| msgid ""
+#| "Source packages are tracked separately from binary packages via "
+#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
+#| "means that you will need to add such a line for each repository you want "
+#| "to get sources from. If you don't do this you will probably get another "
+#| "(newer, older or none) source version than the one you have installed or "
+#| "could install."
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
"Paketquellen werden vom Programmpaket getrennt über <literal>deb-src</"
"literal>-Typzeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, "
@@ -3017,7 +3045,7 @@ msgstr ""
"installiert haben oder installieren könnten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -3032,7 +3060,7 @@ msgstr ""
"angegeben ist, wird das Quellpaket nicht entpackt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3048,18 +3076,23 @@ msgstr ""
"literal>-Option."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
+#, fuzzy
+#| msgid ""
+#| "Note that source packages are not tracked like binary packages, they "
+#| "exist only in the current directory and are similar to downloading source "
+#| "tar balls."
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
"Beachten Sie, dass Quellpakete nicht wie normale Programmpakete nachverfolgt "
"werden, sie existieren nur im aktuellen Verzeichnis und sind "
"heruntergeladenen Tarballs ähnlich."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
@@ -3075,7 +3108,7 @@ msgstr ""
"angegeben werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3084,7 +3117,7 @@ msgstr ""
"Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
@@ -3093,7 +3126,7 @@ msgstr ""
"Verzeichnis herunterladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3112,7 +3145,7 @@ msgstr ""
"Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3132,7 +3165,7 @@ msgstr ""
"sie auf »off« gesetzt ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for other packages and are "
@@ -3143,15 +3176,15 @@ msgstr ""
"erfüllen und die nicht mehr benötigt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
@@ -3166,7 +3199,7 @@ msgstr ""
"Befehl <option>install</option> angeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3175,7 +3208,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -3184,7 +3217,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3194,7 +3227,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3223,9 +3256,9 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -3244,7 +3277,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3256,14 +3289,14 @@ msgstr ""
"<literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
"still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
@@ -3276,7 +3309,7 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3287,14 +3320,24 @@ msgstr ""
"<literal>APT::Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
-msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+#: apt-get.8.xml:330
+#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatic. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true). Neither "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
+msgid ""
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
"Ausführung der Simulation als normaler Anwender wird das Sperren "
"(<literal>Debug::NoLocking</literal>) automatisch deaktivieren. Außerdem "
@@ -3305,12 +3348,19 @@ msgstr ""
"Warnungen von <literal>apt-get</literal> wissen, was er tut)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
"Simulieren gibt eine Serie von Zeilen aus, von denen jede eine Dpkg-"
"Operation darstellt: Konfigurieren (Conf), Entfernen (Remv), Entpacken "
@@ -3344,8 +3394,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
+#, fuzzy
+#| msgid ""
+#| "Show upgraded packages; Print out a list of all packages that are to be "
+#| "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
"zeigt Pakete, von denen ein Upgrade durchgeführt werden soll; Gibt eine "
@@ -3391,7 +3445,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -3405,7 +3459,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -3419,7 +3473,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -3433,7 +3487,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -3449,7 +3503,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3458,7 +3512,7 @@ msgid ""
"Print-URIs</literal>."
msgstr ""
"Anstatt die Dateien herunterzuladen, werden ihre URIs ausgegeben. Jede URI "
-"wird den Pfad, den Zieldateinamen, die Größe und den erwarteten md5-Hash "
+"wird den Pfad, den Zieldateinamen, die Größe und den erwarteten MD5-Hash "
"enthalten. Beachten Sie, dass der zu schreibende Dateiname nicht immer dem "
"Dateinamen auf der entfernt gelegenen Seite entspricht. Dies funktioniert "
"auch mit den Befehlen <literal>source</literal> und <literal>update</"
@@ -3483,7 +3537,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"installiert Pakete erneut, die bereits installiert sind und die neueste "
@@ -3491,13 +3545,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
-msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+#, fuzzy
+#| msgid ""
+#| "This option defaults to on, use <literal>--no-list-cleanup</literal> to "
+#| "turn it off. When on <command>apt-get</command> will automatically manage "
+#| "the contents of <filename>&statedir;/lists</filename> to ensure that "
+#| "obsolete files are erased. The only reason to turn it off is if you "
+#| "frequently change your source list. Configuration Item: <literal>APT::"
+#| "Get::List-Cleanup</literal>."
+msgid ""
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
"Diese Option ist standardmäßig eingeschaltet. Um sie auszuschalten, benutzen "
"Sie <literal>--no-list-cleanup</literal>. Wenn eingeschaltet, wird "
@@ -3508,9 +3570,9 @@ msgstr ""
"Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -3533,10 +3595,10 @@ msgstr ""
"auch die &apt-preferences;-Handbuchseite."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
@@ -3547,7 +3609,7 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -3556,11 +3618,11 @@ msgstr ""
"Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
"Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</"
@@ -3570,7 +3632,7 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3589,7 +3651,7 @@ msgstr ""
"Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3601,7 +3663,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -3610,7 +3672,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3621,7 +3683,7 @@ msgstr ""
"<literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3632,7 +3694,7 @@ msgstr ""
"preferences;, das APT-Howto."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3866,13 +3928,13 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg --set-"
"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
+"effected by the <option>--file</option> option."
msgstr ""
"<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
"markieren, was verhindert, dass das Paket automatisch installiert, ein "
"Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
"Wrapper um <command>dpkg --set-selections</command> und der Status wird "
-"daher durch &dpkg; verwaltet und nicht durch die Option <option>--filename</"
+"daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
"option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4836,7 +4898,7 @@ msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
-"Der CD-ROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
+"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
"dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
"erhalten."
@@ -5232,8 +5294,8 @@ msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -5241,7 +5303,7 @@ msgid ""
"cdrom block. It is important to have the trailing slash. Unmount commands "
"can be specified using UMount."
msgstr ""
-"CDROM-URIs; Die einzige Einstellung für CDROM-URIs ist der Einhängepunkt "
+"CD-ROM-URIs; Die einzige Einstellung für CD-ROM-URIs ist der Einhängepunkt "
"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks "
"sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist "
"möglich alternative Ein- und Aushängebefehle anzugeben, falls Ihr "
@@ -6053,7 +6115,7 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-"
"Daten in CD-ROM-IDs aus."
@@ -8000,7 +8062,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
"Das cdrom-Schema erlaubt APT ein lokales CD-ROM-Laufwerk mit Medienwechsel "
@@ -8617,12 +8679,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
diff --git a/doc/po/es.po b/doc/po/es.po
index 96075a0c0..e76665e4d 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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+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"
@@ -1298,7 +1298,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "Opciones"
@@ -1452,14 +1452,14 @@ msgstr ""
"Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1473,7 +1473,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -1489,13 +1489,13 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
msgstr "Herramienta de APT para la gestión de discos ópticos"
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
@@ -1509,7 +1509,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"Es necesario usar <command>apt-cdrom</command> para añadir los discos al "
@@ -1521,25 +1521,25 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
"<literal>add</literal> añade un disco nuevo a la lista de fuentes. "
"Desmontará el dispositivo del disco y pedirá que se inserte un disco para "
"iniciar el análisis y copiado de los ficheros de índice. Si el disco no "
-"contiene un directorio <filename>disk</filename> apropiado, se le pedirá un "
+"contiene un directorio <filename>.disk</filename> apropiado, se le pedirá un "
"título descriptivo."
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"APT usa un identificador de CDROM para reconocer qué disco está actualmente "
+"APT usa un identificador de CD-ROM para reconocer qué disco está actualmente "
"en la unidad lectora y mantiene una lista de estos identificadores en "
"<filename>&statedir;/cdroms.list</filename>"
@@ -1560,7 +1560,7 @@ msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1572,9 +1572,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
"Renombra un disco. Cambia la etiqueta de un disco o invalida la etiqueta del "
"disco. Esta opción hará que <command>apt-cdrom</command> solicite una "
@@ -1652,7 +1652,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
"<command>apt-config</command> es un programa interno que usan varios "
"programas del conjunto de herramientas de APT para ofrecer un método de "
@@ -1662,12 +1662,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value. In a shell "
+#| "script it should be used like:"
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
"Se usa para acceder a la información de la configuración mediante un script. "
"Se proporcionan parejas de argumentos, el primero es una variable del "
@@ -1731,12 +1738,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1761,10 +1767,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Herramienta para extraer la configuración de DebConf y las plantillas de los "
-"paquetes de Debian"
+"Herramienta para extraer la configuración de <command>debconf</command> y "
+"las plantillas de los paquetes de Debian"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1804,13 +1812,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
"El directorio temporal en el que se escribirán los ficheros de plantillas "
-"debconf y los scripts de configuración extraídos. Opción de configuración: "
-"<literal>APT::ExtractTemplates::TempDir</literal>"
+"<command>debconf</command> y los scripts de configuración extraídos. Opción "
+"de configuración: <literal>APT::ExtractTemplates::TempDir</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2865,32 +2873,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> se usa junto al tradicional administrador "
-"de paquetes de Debian, &dselect;. <literal>dselect-upgrade</literal> "
-"registra los cambios que haya hecho &dselect; al campo <literal>Status</"
-"literal> (estado) de los paquetes disponibles y realiza las acciones "
-"necesarias para que los cambios se lleven a cabo (por ejemplo, borrar "
-"paquetes antiguos e instalar las nuevas versiones)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
"<literal>dist-upgrade</literal>, además de realizar las acciones de "
"<literal>upgrade</literal>, trata inteligentemente los cambios de "
@@ -2903,16 +2895,34 @@ msgstr ""
"comportamiento para paquetes individuales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> se usa junto al tradicional administrador "
+"de paquetes de Debian, &dselect;. <literal>dselect-upgrade</literal> "
+"registra los cambios que haya hecho &dselect; al campo <literal>Status</"
+"literal> (estado) de los paquetes disponibles y realiza las acciones "
+"necesarias para que los cambios se lleven a cabo (por ejemplo, borrar "
+"paquetes antiguos e instalar las nuevas versiones)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2920,15 +2930,15 @@ msgstr ""
"<literal>install</literal> instala o actualiza los paquetes que siguen a la "
"palabra «install». Cada paquete es un nombre de paquete, y no el nombre "
"completo del fichero del paquete (por ejemplo, en un sistema Debian GNU/"
-"Linux, el argumento sería libc6, no <literal>libc6_1.9.6-2.deb</literal>). "
-"Se obtendrán e instalarán todos los paquetes necesarios por los paquetes "
-"especificados para la instalación. El fichero <filename>/etc/apt/sources."
-"list</filename> se usa para ubicar los paquetes. Si antepone un guión al "
-"nombre del paquete (sin ningún espacio) el paquete se desinstalará en vez de "
-"instalar. De forma similar, el signo de suma se puede usar para especificar "
-"que un paquete se debe instalar. Estas últimas características se pueden "
-"usar para invalidar las decisiones tomadas por el sistema de resolución de "
-"conflictos de apt-get."
+"Linux, el argumento sería <package>apt-utils</package>, no <filename>apt-"
+"utils_&apt-product-version;_amd64.deb</filename>). Se obtendrán e instalarán "
+"todos los paquetes necesarios por los paquetes especificados para la "
+"instalación. El fichero <filename>/etc/apt/sources.list</filename> se usa "
+"para ubicar los paquetes. Si antepone un guión al nombre del paquete (sin "
+"ningún espacio) el paquete se desinstalará en vez de instalar. De forma "
+"similar, el signo de suma se puede usar para especificar que un paquete se "
+"debe instalar. Estas últimas características se pueden usar para invalidar "
+"las decisiones tomadas por el sistema de resolución de conflictos de apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:116
@@ -3010,9 +3020,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
@@ -3054,12 +3064,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:172
+#, fuzzy
+#| msgid ""
+#| "Source packages are tracked separately from binary packages via "
+#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
+#| "means that you will need to add such a line for each repository you want "
+#| "to get sources from. If you don't do this you will probably get another "
+#| "(newer, older or none) source version than the one you have installed or "
+#| "could install."
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
"Los paquetes fuente se registran de forma separada a los paquetes binarios "
"mediante líneas del tipo <literal>deb-src</literal> en el fichero &sources-"
@@ -3069,7 +3087,7 @@ msgstr ""
"instalada o de la que podría instalar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
#, fuzzy
#| msgid ""
#| "If the <option>--compile</option> option is specified then the package "
@@ -3089,7 +3107,7 @@ msgstr ""
"desempaquetará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3104,18 +3122,23 @@ msgstr ""
"activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
+#, fuzzy
+#| msgid ""
+#| "Note that source packages are not tracked like binary packages, they "
+#| "exist only in the current directory and are similar to downloading source "
+#| "tar balls."
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
"Tenga en cuenta que los paquetes fuentes no se tratan como los binarios, "
"sólo existen en el directorio actual y es parecido a descargar los paquetes "
"tar comprimidos con las fuentes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
#, fuzzy
#| msgid ""
#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3132,7 +3155,7 @@ msgstr ""
"fuente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3141,14 +3164,14 @@ msgstr ""
"caché de paquetes y revisa la existencia de dependencias rotas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3167,7 +3190,7 @@ msgstr ""
"literal> de vez en cuando para liberar algo de espacio en disco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3186,7 +3209,7 @@ msgstr ""
"desactivada impedirá que se borren los paquetes instalados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
#, fuzzy
#| msgid ""
#| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3202,21 +3225,21 @@ msgstr ""
"paquete, pero que ya no son necesarios."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3225,7 +3248,7 @@ msgstr ""
"de configuración: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -3238,7 +3261,7 @@ msgstr ""
"de configuración: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3247,7 +3270,7 @@ msgstr ""
"instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3275,9 +3298,9 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -3295,7 +3318,7 @@ msgstr ""
"<literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3307,14 +3330,14 @@ msgstr ""
"<literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
"Produce una salida adecuada para su registro, omitiendo los indicadores de "
@@ -3328,7 +3351,7 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3339,14 +3362,24 @@ msgstr ""
"Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
-msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+#: apt-get.8.xml:330
+#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatic. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true). Neither "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
+msgid ""
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
"Si la simulación se ejecuta como usuario desactivará el bloqueo automático "
"(<literal>Debug::NoLocking</literal>). Si la opción <literal>APT::Get::Show-"
@@ -3357,12 +3390,19 @@ msgstr ""
"avisos de <literal>apt-get</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
"La simulación muestra en la pantalla una serie de líneas, cada una de las "
"cuales representa una operación de dpkg, configurar (Conf), desinstalar "
@@ -3396,7 +3436,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
"Muestra los paquetes que se van a actualizar. Opción de configuración: "
@@ -3434,7 +3474,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -3448,7 +3488,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -3462,12 +3502,12 @@ msgstr ""
#: apt-get.8.xml:400
#, fuzzy
#| msgid ""
-#| "Do not install new packages; When used in conjunction with "
+#| "Do not install new packages; when used in conjunction with "
#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
#| "packages on the command line from being upgraded if they are not already "
#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -3480,7 +3520,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -3497,7 +3537,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3532,7 +3572,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"Reinstala los paquetes ya instalados, incluso si son la última versión "
@@ -3541,13 +3581,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
-msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+#, fuzzy
+#| msgid ""
+#| "This option defaults to on, use <literal>--no-list-cleanup</literal> to "
+#| "turn it off. When on <command>apt-get</command> will automatically manage "
+#| "the contents of <filename>&statedir;/lists</filename> to ensure that "
+#| "obsolete files are erased. The only reason to turn it off is if you "
+#| "frequently change your source list. Configuration Item: <literal>APT::"
+#| "Get::List-Cleanup</literal>."
+msgid ""
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
"Esta opción está activada de forma predeterminada, si quiere desactivarla "
"use <literal>--no-list-cleanup</literal>. Cuando está activada <command>apt-"
@@ -3558,9 +3606,9 @@ msgstr ""
"<literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -3582,10 +3630,10 @@ msgstr ""
"también la página del manual de &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
@@ -3596,7 +3644,7 @@ msgstr ""
"<literal>APT::Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -3605,11 +3653,11 @@ msgstr ""
"preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
"Si la orden es <literal>install</literal> o <literal>remove</literal>, esta "
@@ -3618,7 +3666,7 @@ msgstr ""
"configuración: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3638,7 +3686,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3649,7 +3697,7 @@ msgstr ""
"Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -3658,7 +3706,7 @@ msgstr ""
"arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3669,7 +3717,7 @@ msgstr ""
"configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3680,7 +3728,7 @@ msgstr ""
"preferences;, el Cómo de APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3915,7 +3963,7 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg --set-"
"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
+"effected by the <option>--file</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5324,8 +5372,8 @@ msgstr "/cdrom/::Mount \"algo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -5333,9 +5381,9 @@ msgid ""
"cdrom block. It is important to have the trailing slash. Unmount commands "
"can be specified using UMount."
msgstr ""
-"CDROM URI, la única opción de configuración para las URI de CDROM es el "
+"CD-ROM URI, la única opción de configuración para las URI de CD-ROM es el "
"punto de montaje. <literal>cdrom::Mount</literal> debe ser el punto de "
-"montaje de la unidad de CDROM tal y como se especifica en <filename>/etc/"
+"montaje de la unidad de CD-ROM tal y como se especifica en <filename>/etc/"
"fstab</filename>. Es posible proporcionar órdenes «mount» y «unmount» "
"alternativas si el punto de montaje no se puede especificar en el fichero "
"fstab (como con SMB y versiones antiguas de mount). La sintaxis consiste en "
@@ -6165,10 +6213,10 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> desactiva la inclusión de los datos de "
-"statfs en los identificadores de los CDROM."
+"statfs en los identificadores de los CD-ROM."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:785
@@ -8099,10 +8147,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
-"El esquema «cdrom» permite a APT usar la unidad de CDROM local. Use el "
+"El esquema «cdrom» permite a APT usar la unidad de CD-ROM local. Use el "
"programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
"list»."
@@ -8711,12 +8759,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
"Para habilitar el método APT tiene que seleccionar [M]étodo en "
"<prgn>dselect</prgn>, y después seleccionar el método APT. Se le pedirá un "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 08c60d915..4f73a2faa 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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+0300\n"
"PO-Revision-Date: 2012-06-02 18:37+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1337,7 +1337,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "options"
@@ -1496,14 +1496,14 @@ msgstr ""
"Élément de configuration : <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1517,7 +1517,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -1533,13 +1533,13 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
msgstr "Utilitaire de gestion des CD d'APT"
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
@@ -1553,7 +1553,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"Il est nécessaire d'utiliser <command>apt-cdrom</command> pour ajouter des "
@@ -1565,21 +1565,21 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
"La commande <literal>add</literal> est utilisée pour ajouter un nouveau "
"disque à la liste des sources. Elle démonte le CD, réclame l'insertion d'un "
"disque, parcourt ensuite le disque et copie les fichiers d'index. Si le "
-"disque ne possède pas de répertoire <filename>disk/</filename> correct, un "
+"disque ne possède pas de répertoire <filename>.disk</filename> correct, un "
"titre descriptif est demandé."
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
@@ -1604,7 +1604,7 @@ msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1616,9 +1616,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
"Change le nom d'un disque ; change le nom d'un disque ou remplace un disque "
"pour un nom donné. Cette option oblige <command>apt-cdrom</command> à "
@@ -1698,7 +1698,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
"<command>apt-config</command> est un programme interne utilisé par "
"différents composants d'APT ; il offre la possibilité d'une configuration "
@@ -1708,12 +1708,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value. In a shell "
+#| "script it should be used like:"
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
"Le terme shell est utilisé pour accéder aux informations de configuration "
"depuis un script shell. Deux arguments doivent lui être donnés ; le premier "
@@ -1776,12 +1783,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1806,10 +1812,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Outil d'extraction des textes et fichiers de configuration pour DebConf "
-"contenu dans un paquet Debian"
+"Outil d'extraction des textes et fichiers de configuration pour "
+"<command>debconf</command> contenu dans un paquet Debian"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1849,13 +1857,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
"Répertoire temporaire dans lequel écrire les scripts de configuration et "
-"modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::"
-"ExtractTemplates::TempDir</literal>."
+"modèles d'écrans pour <command>debconf</command>. Élément de configuration : "
+"<literal>APT::ExtractTemplates::TempDir</literal>."
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2916,33 +2924,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
-"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
-"paquets. La commande <literal>dselect-upgrade</literal> suit les "
-"modifications faites par &dselect; dans le champ <literal>Status</literal> "
-"des paquets disponibles, et effectue les actions nécessaires à la "
-"réalisation de cet état (par exemple, suppression d'anciens paquets, "
-"installation de nouveaux paquets)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
"La commande <literal>dist-upgrade</literal> effectue la fonction "
"<literal>upgrade</literal> en y ajoutant une gestion intelligente des "
@@ -2955,16 +2946,35 @@ msgstr ""
"un mécanisme de remplacement des paramètres généraux pour certains paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
+"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
+"paquets. La commande <literal>dselect-upgrade</literal> suit les "
+"modifications faites par &dselect; dans le champ <literal>Status</literal> "
+"des paquets disponibles, et effectue les actions nécessaires à la "
+"réalisation de cet état (par exemple, suppression d'anciens paquets, "
+"installation de nouveaux paquets)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2972,14 +2982,15 @@ 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, 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</filename> est utilisé "
-"pour retrouver les paquets désirés. Quand un trait d'union est accolé (sans "
-"espace intermédiaire) au nom d'un paquet déjà installé, ce paquet est "
-"supprimé. De même on peut ajouter un signe « + » pour désigner un paquet à "
-"installer. Cette dernière fonctionnalité peut être utilisée pour annuler "
-"les décisions prises par le système de résolution des conflits d'apt-get."
+"<package>apt-utils</package> et non pas <filename>apt-utils_&apt-product-"
+"version;_amd64.deb</filename>). 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</filename> est utilisé pour retrouver les "
+"paquets désirés. Quand un trait d'union est accolé (sans espace "
+"intermédiaire) au nom d'un paquet déjà installé, ce paquet est supprimé. De "
+"même on peut ajouter un signe « + » pour désigner un paquet à installer. "
+"Cette dernière fonctionnalité peut être utilisée pour annuler les décisions "
+"prises par le système de résolution des conflits d'apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:116
@@ -3062,9 +3073,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
"La commande <literal>remove</literal> est identique à la commande "
@@ -3107,12 +3118,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:172
+#, fuzzy
+#| msgid ""
+#| "Source packages are tracked separately from binary packages via "
+#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
+#| "means that you will need to add such a line for each repository you want "
+#| "to get sources from. If you don't do this you will probably get another "
+#| "(newer, older or none) source version than the one you have installed or "
+#| "could install."
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
"Les paquets source sont gérés indépendamment des paquets binaires, avec les "
"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il "
@@ -3122,7 +3141,7 @@ msgstr ""
"installé ou que vous voulez installer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
#, fuzzy
#| msgid ""
#| "If the <option>--compile</option> option is specified then the package "
@@ -3141,7 +3160,7 @@ msgstr ""
"download-only</option> est spécifié, le source n'est pas décompacté."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3156,18 +3175,23 @@ msgstr ""
"Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
+#, fuzzy
+#| msgid ""
+#| "Note that source packages are not tracked like binary packages, they "
+#| "exist only in the current directory and are similar to downloading source "
+#| "tar balls."
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
"Veuillez noter que les paquets source ne sont pas suivis comme le sont les "
"paquets binaires. Ils ne sont présents que dans le répertoire courant et "
"sont semblables à des sources téléchargées sous forme d'archives tar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
#, fuzzy
#| msgid ""
#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3184,7 +3208,7 @@ msgstr ""
"paquet source."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3193,7 +3217,7 @@ msgstr ""
"jour le cache des paquets et cherche les dépendances défectueuses."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
@@ -3202,7 +3226,7 @@ msgstr ""
"répertoire courant."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3221,7 +3245,7 @@ msgstr ""
"temps en temps si l'on veut libérer de l'espace disque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3240,7 +3264,7 @@ msgstr ""
"installés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
#, fuzzy
#| msgid ""
#| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3256,15 +3280,15 @@ msgstr ""
"ne sont plus nécessaires."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
@@ -3280,7 +3304,7 @@ msgstr ""
"<option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3289,7 +3313,7 @@ msgstr ""
"Élément de configuration : <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -3298,7 +3322,7 @@ msgstr ""
"de configuration : <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3308,7 +3332,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3336,9 +3360,9 @@ msgstr ""
"configuration : <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -3356,7 +3380,7 @@ msgstr ""
"<literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3368,14 +3392,14 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
"Mode silencieux ; cette commande produit une sortie destinée à "
@@ -3390,7 +3414,7 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3401,14 +3425,24 @@ msgstr ""
"<literal>APT::Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
-msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+#: apt-get.8.xml:330
+#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatic. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true). Neither "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
+msgid ""
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
"Lorsque la simulation est effectuée par un utilisateur sans privilège, le "
"verrouillage (<literal>Debug::NoLocking</literal>) sera désactivé "
@@ -3420,12 +3454,19 @@ msgstr ""
"utile qu'<literal>apt-get</literal> envoie de telles notifications)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
"La simulation affiche une série de lignes représentant chacune une opération "
"de dpkg, Configure (Conf), Remove (Remv), Unpack (Inst). Des crochets "
@@ -3458,7 +3499,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
"Afficher les paquets mis à niveau ; affiche une liste de tous les paquets à "
@@ -3497,7 +3538,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -3511,7 +3552,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -3525,12 +3566,12 @@ msgstr ""
#: apt-get.8.xml:400
#, fuzzy
#| msgid ""
-#| "Do not install new packages; When used in conjunction with "
+#| "Do not install new packages; when used in conjunction with "
#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
#| "packages on the command line from being upgraded if they are not already "
#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -3544,7 +3585,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -3561,7 +3602,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3571,7 +3612,7 @@ msgid ""
msgstr ""
"Au lieu de récupérer les paquets à installer, leurs URI sont affichées. "
"Chaque URI a un chemin, un nom de fichier destination, une taille et une clé "
-"md5 attendue. Veuillez noter que le nom de fichier à afficher ne correspond "
+"MD5 attendue. Veuillez noter que le nom de fichier à afficher ne correspond "
"pas toujours au nom de fichier sur le site distant. Cette option fonctionne "
"aussi avec la commande <literal>source</literal> et avec la commande "
"<literal>update</literal>. Avec la commande <literal>update</literal>, la "
@@ -3596,7 +3637,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"Réinstaller les paquets déjà installés avec leur version la plus récente. "
@@ -3604,13 +3645,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
-msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+#, fuzzy
+#| msgid ""
+#| "This option defaults to on, use <literal>--no-list-cleanup</literal> to "
+#| "turn it off. When on <command>apt-get</command> will automatically manage "
+#| "the contents of <filename>&statedir;/lists</filename> to ensure that "
+#| "obsolete files are erased. The only reason to turn it off is if you "
+#| "frequently change your source list. Configuration Item: <literal>APT::"
+#| "Get::List-Cleanup</literal>."
+msgid ""
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
"Cette option est activée par défaut ; utilisez <literal>--no-list-cleanup</"
"literal> pour la désactiver. Quand elle est activée, <command>apt-get</"
@@ -3621,9 +3670,9 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -3643,10 +3692,10 @@ msgstr ""
"Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
@@ -3657,7 +3706,7 @@ msgstr ""
"Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -3667,11 +3716,11 @@ msgstr ""
"Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
"Si la commande utilisée est soit <literal>install</literal> soit "
@@ -3680,7 +3729,7 @@ msgstr ""
"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3700,7 +3749,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3712,7 +3761,7 @@ msgstr ""
"literal>, "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -3722,7 +3771,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3734,7 +3783,7 @@ msgstr ""
"AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3745,7 +3794,7 @@ msgstr ""
"« HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3976,7 +4025,7 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg --set-"
"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
+"effected by the <option>--file</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5381,8 +5430,8 @@ msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -6235,7 +6284,7 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> désactive l'inclusion de données de "
"type statfs dans les identifiants de CD."
@@ -8150,7 +8199,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
"Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CD "
@@ -8769,12 +8818,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
"Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans "
"<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
diff --git a/doc/po/it.po b/doc/po/it.po
index d1f0fc289..177905070 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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+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"
@@ -905,7 +905,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
@@ -1013,14 +1013,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1034,7 +1034,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
@@ -1048,13 +1048,13 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
@@ -1064,7 +1064,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
@@ -1072,16 +1072,16 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
@@ -1101,7 +1101,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1109,9 +1109,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1170,7 +1170,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1178,9 +1178,9 @@ msgstr ""
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
@@ -1228,12 +1228,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1256,7 +1255,9 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1287,9 +1288,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -2055,6 +2056,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
+"<literal>dist-upgrade</literal> in addition to performing the function of "
+"<literal>upgrade</literal>, also intelligently handles changing dependencies "
+"with new versions of packages; <command>apt-get</command> has a \"smart\" "
+"conflict resolution system, and it will attempt to upgrade the most "
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
"literal> follows the changes made by &dselect; to the <literal>Status</"
@@ -2064,30 +2080,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
-"<literal>dist-upgrade</literal> in addition to performing the function of "
-"<literal>upgrade</literal>, also intelligently handles changing dependencies "
-"with new versions of packages; <command>apt-get</command> has a \"smart\" "
-"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2146,9 +2149,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
@@ -2176,14 +2179,14 @@ msgstr ""
#: apt-get.8.xml:172
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2193,7 +2196,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2203,15 +2206,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
@@ -2221,21 +2224,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2247,7 +2250,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2259,7 +2262,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for other packages and are "
@@ -2267,42 +2270,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -2318,9 +2321,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -2330,7 +2333,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -2338,19 +2341,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -2358,23 +2361,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:330
msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2397,7 +2402,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
@@ -2429,7 +2434,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -2438,7 +2443,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -2447,7 +2452,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -2456,7 +2461,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -2467,7 +2472,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -2488,25 +2493,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -2518,32 +2523,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -2555,7 +2560,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -2563,14 +2568,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -2578,7 +2583,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -2586,7 +2591,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3668,8 +3673,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -4205,7 +4210,7 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -5585,7 +5590,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
@@ -6158,12 +6163,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
"Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
"prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index b46ec4dd0..2154f897e 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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+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"
@@ -1291,7 +1291,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "オプション"
@@ -1452,7 +1452,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 apt-key.8.xml:174 apt-mark.8.xml:125
#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr "ファイル"
@@ -1460,7 +1460,7 @@ msgstr "ファイル"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1476,7 +1476,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -1494,29 +1494,29 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "APT CDROM 管理ユーティリティ"
+msgid "APT CD-ROM management utility"
+msgstr "APT CD-ROM 管理ユーティリティ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
msgstr ""
"<command>apt-cdrom</command> は利用可能な取得元として、APT のリストに新しい "
-"CDROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な"
-"限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認を"
-"行います。"
+"CD-ROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能"
+"な限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認"
+"を行います。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"APT システムに手作業で CD を追加するのは難しいため、<command>apt-cdrom</"
@@ -1527,26 +1527,27 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
-"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ"
-"バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン"
-"とインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
-"filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
+"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CD-ROM "
+"デバイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャ"
+"ンとインデックスファイルのコピーを行います。ディスクに正しい <filename>."
+"disk</filename> ディレクトリが存在しない場合、タイトルを入力するよう促しま"
+"す。"
# 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"APT は、現在ドライブにあるディスクのトラックから取得した、CDROM ID を使用しま"
-"す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
+"APT は、現在ドライブにあるディスクのトラックから取得した、CD-ROM ID を使用し"
+"ます。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
"ベースで管理します。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -1569,7 +1570,7 @@ msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1581,9 +1582,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
"ディスクの名前変更 - 指定した名前でディスクのラベルを変更・更新します。このオ"
"プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
@@ -1669,7 +1670,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
"<command>apt-config</command> は、APT スイートの様々な所で一貫した設定を行う"
"ために使用する、内部ツールです。スクリプトアプリケーションで使いやすい方法"
@@ -1679,12 +1680,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value. In a shell "
+#| "script it should be used like:"
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
"shell は、シェルスクリプトから設定情報にアクセスするのに使用します。引数とし"
"て、まずシェル変数、次に取得したい設定値をペアで与えます。出力として、現在の"
@@ -1749,12 +1757,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
# type: Content of: <refentry><refsect1><para>
@@ -1782,7 +1789,11 @@ msgstr "1"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+#, fuzzy
+#| msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
"Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
"ティ"
@@ -1834,12 +1845,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
-"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト"
-"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>"
+"抽出した <command>debconf</command> テンプレートファイルや設定スクリプトを書"
+"き出す一時ディレクトリ。設定項目 - <literal>APT::ExtractTemplates::TempDir</"
+"literal>"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -2928,32 +2940,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
-"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
-"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
-"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
-"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
"<literal>dist-upgrade</literal> は、<literal>upgrade</literal> の機能に加え、"
"新バージョンのパッケージに対する依存関係の変更を知的に操作します。"
@@ -2967,30 +2963,49 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
+"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
+"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
+"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
+"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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 ""
"<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指"
"定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例"
-"えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> ではなく "
-"libc6 を引数として与えます)。インストールするよう指定したすべてのパッケージに"
-"対し、取得・インストールを行います。<filename>/etc/apt/sources.list</"
-"filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
-"ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ"
-"がインストールされていれば削除します。同様に、インストールするパッケージを明"
-"示するのにプラス記号も使用できます。この記号は apt-get の競合解決システムの判"
-"断を上書きするのに利用される可能性があります。"
+"えば Debian システムでは、<literal>apt-utils_&apt-product-version;_amd64."
+"deb</literal> ではなく <package>apt-utils</package> を引数として与えます)。イ"
+"ンストールするよう指定したすべてのパッケージに対し、取得・インストールを行い"
+"ます。<filename>/etc/apt/sources.list</filename> ファイルを、要求するパッケー"
+"ジの場所を特定するのに使用します。パッケージ名の後ろに (空白を含まず) ハイフ"
+"ンが追加されている場合、そのパッケージがインストールされていれば削除します。"
+"同様に、インストールするパッケージを明示するのにプラス記号も使用できます。こ"
+"の記号は apt-get の競合解決システムの判断を上書きするのに利用される可能性があ"
+"ります。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3072,9 +3087,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
"<literal>remove</literal> は、パッケージが削除されることを除き、"
@@ -3116,12 +3131,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:172
+#, fuzzy
+#| msgid ""
+#| "Source packages are tracked separately from binary packages via "
+#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
+#| "means that you will need to add such a line for each repository you want "
+#| "to get sources from. If you don't do this you will probably get another "
+#| "(newer, older or none) source version than the one you have installed or "
+#| "could install."
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
"ソースパッケージは、&sources-list; ファイルの <literal>deb-src</literal> タイ"
"プにより、バイナリパッケート分けて管理されます。つまり、ソースを取得したいリ"
@@ -3130,7 +3153,7 @@ msgstr ""
"もっと適切なものを取得します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
#, fuzzy
#| msgid ""
#| "If the <option>--compile</option> option is specified then the package "
@@ -3151,7 +3174,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3166,18 +3189,23 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
+#, fuzzy
+#| msgid ""
+#| "Note that source packages are not tracked like binary packages, they "
+#| "exist only in the current directory and are similar to downloading source "
+#| "tar balls."
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
"tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに"
"展開されることに注意してください。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
#, fuzzy
#| msgid ""
#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3194,7 +3222,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3203,7 +3231,7 @@ msgstr ""
"チェックする診断ツールです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
@@ -3211,7 +3239,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3230,7 +3258,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3250,7 +3278,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
#, fuzzy
#| msgid ""
#| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3265,22 +3293,22 @@ msgstr ""
"され、もう必要なくなったパッケージを削除するのに使用します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3290,7 +3318,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -3304,7 +3332,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3314,7 +3342,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3341,9 +3369,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -3361,7 +3389,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3373,14 +3401,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
"静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。最大 2 つまで q "
@@ -3393,7 +3421,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3403,14 +3431,24 @@ msgstr ""
"行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
-msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+#: apt-get.8.xml:330
+#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatic. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true). Neither "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
+msgid ""
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
"シミュレーションは、自動ではロックを行わず (<literal>Debug::NoLocking</"
"literal>) ユーザ権限で実行します。また、<literal>APT::Get::Show-User-"
@@ -3421,12 +3459,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
"シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、設定 (Conf)、削除 "
"(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
@@ -3465,7 +3510,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
"更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - "
@@ -3506,7 +3551,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -3520,7 +3565,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -3533,7 +3578,7 @@ msgstr ""
#: apt-get.8.xml:400
#, fuzzy
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -3546,7 +3591,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -3562,7 +3607,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3571,7 +3616,7 @@ msgid ""
"Print-URIs</literal>."
msgstr ""
"インストールするファイルを取得する代わりに、その URI を表示します。URI には、"
-"パス、対象ファイル名、ファイルサイズ、予測される md5 ハッシュが含まれていま"
+"パス、対象ファイル名、ファイルサイズ、予測される MD5 ハッシュが含まれていま"
"す。出力したファイル名が、常にリモートサイトのファイル名と一致するわけではな"
"い、ということに注意してください! これは <literal>source</literal> コマンド、"
"<literal>update</literal> コマンドでも動作します。<literal>update</literal> "
@@ -3597,7 +3642,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"すでに最新版がインストールされていても、パッケージを再インストールします。設"
@@ -3606,13 +3651,21 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
-msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+#, fuzzy
+#| msgid ""
+#| "This option defaults to on, use <literal>--no-list-cleanup</literal> to "
+#| "turn it off. When on <command>apt-get</command> will automatically manage "
+#| "the contents of <filename>&statedir;/lists</filename> to ensure that "
+#| "obsolete files are erased. The only reason to turn it off is if you "
+#| "frequently change your source list. Configuration Item: <literal>APT::"
+#| "Get::List-Cleanup</literal>."
+msgid ""
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
"この機能はデフォルトで ON になっています。OFF にするには <literal>--no-list-"
"cleanup</literal> としてください。ON の場合、<command>apt-get</command> は古"
@@ -3622,9 +3675,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -3645,10 +3698,10 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
@@ -3659,7 +3712,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -3669,11 +3722,11 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
"コマンドが <literal>install</literal> か <literal>remove</literal> である場"
@@ -3683,7 +3736,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3702,7 +3755,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3714,7 +3767,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -3724,7 +3777,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3736,7 +3789,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3748,7 +3801,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4005,7 +4058,7 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg --set-"
"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
+"effected by the <option>--file</option> option."
msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5358,8 +5411,8 @@ msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -5367,14 +5420,14 @@ msgid ""
"cdrom block. It is important to have the trailing slash. Unmount commands "
"can be specified using UMount."
msgstr ""
-"CDROM URI - CDROM URI はマウントポイントの設定のみを行います。<filename>/etc/"
-"fstab</filename> で設定されているように、CDROM ドライブのマウントポイントを "
-"<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古"
-"い mount パッケージなど) マウントポイントが fstab に記述できない場合、かわり"
-"にマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロックを "
-"<placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを"
-"後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
-"す。"
+"CD-ROM URI - CD-ROM URI はマウントポイントの設定のみを行います。<filename>/"
+"etc/fstab</filename> で設定されているように、CD-ROM ドライブのマウントポイン"
+"トを <literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウン"
+"トや古い mount パッケージなど) マウントポイントが fstab に記述できない場合、"
+"かわりにマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロック"
+"を <placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッ"
+"シュを後につけるのが重要です。アンマウントコマンドは UMount で指定することが"
+"できます。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6067,10 +6120,10 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
-"<literal>Debug::IdentCdrom</literal> は CDROM ID にある statfs データの方gain"
-"を無効にします。"
+"<literal>Debug::IdentCdrom</literal> は CD-ROM ID にある statfs データの方"
+"gainを無効にします。"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:785
@@ -8026,7 +8079,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
"cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"
@@ -8553,12 +8606,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
#. type: <example></example>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index b37890657..42d43cad2 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-24 17:16+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+0300\n"
"PO-Revision-Date: 2012-06-02 11:31+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1282,7 +1282,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "opcje"
@@ -1448,14 +1448,14 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1470,7 +1470,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnostyka"
@@ -1488,14 +1488,14 @@ msgstr ""
#
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "Narzędzie APT do zarządzania źródłami typu CDROM"
+msgid "APT CD-ROM management utility"
+msgstr "Narzędzie APT do zarządzania źródłami typu CD-ROM"
#
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
@@ -1510,7 +1510,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"Dodanie nowych CD do systemu APT nie może być zrobione ręcznie, tak więc "
@@ -1521,26 +1521,26 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
"<literal>add</literal> jest używane do dodania nowego dysku do listy źródeł. "
-"Odmontuje urządzenie CDROM, poprosi o włożenie dysku, a następnie zeskanuje "
+"Odmontuje urządzenie CD-ROM, poprosi o włożenie dysku, a następnie zeskanuje "
"go i skopiuje pliki indeksu. Jeżeli dysk nie ma właściwego katalogu "
-"<filename>disk</filename>, użytkownik zostanie poproszony o podanie opisu "
+"<filename>.disk</filename>, użytkownik zostanie poproszony o podanie opisu "
"dysku."
#
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"APT używa identyfikatora CDROM-u do określenia, który dysk obecnie znajduje "
+"APT używa identyfikatora CD-ROM-u do określenia, który dysk obecnie znajduje "
"się w napędzie, oraz przechowuje bazę tych identyfikatorów w pliku "
"<filename>&statedir;/cdroms.list</filename>"
@@ -1563,12 +1563,12 @@ msgstr "Opcje"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
"Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany "
-"cdrom. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w "
+"CD-ROM. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w "
"pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: "
"<literal>Acquire::cdrom::mount</literal>."
@@ -1576,9 +1576,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
"Przemianuj dysk. Zmienia etykietę dysku lub unieważnia etykietę wcześniej "
"daną dyskowi. Podanie tej opcji spowoduje, że <command>apt-cdrom</command> "
@@ -1664,7 +1664,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
"<command>apt-config</command> jest wewnętrznym programem używanym przez "
"różne części pakietu APT w celu zapewnienia spójności konfiguracji. Uzyskuje "
@@ -1673,12 +1673,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value. In a shell "
+#| "script it should be used like:"
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
"shell pozwala skryptom powłoki na uzyskanie informacji o konfiguracji. "
"Wymaga podania pary argumentów: pierwszym z nich jest zmienna powłoki, a "
@@ -1739,14 +1746,22 @@ msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "Defines the output of each config option. &percnt;t will be replaced with "
+#| "the name of the option, &percnt;f with the complete optionname and "
+#| "&percnt;v with the value of the option. Use uppercase letters and "
+#| "special characters in the value will be encoded to ensure that it can e."
+#| "g. be savely used in a quoted-string as defined by RFC822. Additionally "
+#| "&percnt;n will be replaced by a newline, &percnt;N by a tab. A &percnt; "
+#| "can be printed by using &percnt;&percnt;."
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
"Definiuje wyjście każdej opcji konfiguracji. &percnt;t zostanie zastąpiony "
"nazwą znacznika, &percnt;f - pełną nazwą opcji, a &percnt;v - wartością "
@@ -1779,10 +1794,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
"Narzędzie wyciągające z pakietów Debiana skrypty konfiguracyjne i szablony "
-"DebConf"
+"<command>debconf</command>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1821,11 +1838,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
-"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony debconf i "
+"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony <command>debconf</command> i "
"pliki konfiguracyjne. Pozycja w pliku konfiguracyjnym: <literal>APT::"
"ExtractTemplates::TempDir</literal>."
@@ -2683,34 +2700,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> jest używane w połączeniu z programem "
-"&dselect;, tradycyjnym narzędziem do zarządzania pakietami w systemie "
-"Debian. <literal>dselect-upgrade</literal> uwzględnia zmiany zrobione "
-"programem &dselect; w polu <literal>Status</literal> pliku zawierającego "
-"informacje o dostępnych pakietach i wykonuje akcje potrzebne do "
-"zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie "
-"nowych)."
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
"<literal>dist-upgrade</literal> wykonuje to samo, co <literal>upgrade</"
"literal>, jednakże w inteligentny sposób wykrywa zmiany zależności w nowych "
@@ -2723,17 +2722,37 @@ msgstr ""
"znajduje się tam opis mechanizmu nadpisywania globalnych ustawień dla "
"poszczególnych pakietów."
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> jest używane w połączeniu z programem "
+"&dselect;, tradycyjnym narzędziem do zarządzania pakietami w systemie "
+"Debian. <literal>dselect-upgrade</literal> uwzględnia zmiany zrobione "
+"programem &dselect; w polu <literal>Status</literal> pliku zawierającego "
+"informacje o dostępnych pakietach i wykonuje akcje potrzebne do "
+"zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie "
+"nowych)."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2741,7 +2760,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, tym argumentem byłoby libc6, a nie <literal>libc6_1.9.6-2."
+"systemie Debian, tym argumentem byłoby <package>apt-utils</package>, a nie <literal>apt-utils_&apt-product-version;_amd64."
"deb</literal>). Wszystkie pakiety, które są potrzebne do zainstalowania "
"żądanego pakietu (lub żądanych pakietów), będą także ściągnięte i "
"zainstalowane. Plik <filename>/etc/apt/sources.list</filename> zawiera listę "
@@ -2838,9 +2857,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
@@ -2882,12 +2901,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:172
+#, fuzzy
+#| msgid ""
+#| "Source packages are tracked separately from binary packages via "
+#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
+#| "means that you will need to add such a line for each repository you want "
+#| "to get sources from. If you don't do this you will properly get another "
+#| "(newer, older or none) source version than the one you have installed or "
+#| "could install."
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
"Pakiety źródłowe są znajdowane inaczej niż pakiety binarne: przez linie z "
"identyfikatorem <literal>deb-src</literal> w pliku &sources-list;. Oznacza "
@@ -2897,7 +2924,7 @@ msgstr ""
"jest zainstalowana lub możliwa do zainstalowania."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2913,7 +2940,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2929,18 +2956,23 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
+#, fuzzy
+#| msgid ""
+#| "Note that source packages are not tracked like binary packages, they "
+#| "exist only in the current directory and are similar to downloading source "
+#| "tar balls."
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
"Uwaga. Pakiety źródłowe nie są traktowane tak samo, jak pakiety binarne - są "
"przechowywane tylko w bieżącym katalogu, mniej więcej tak, jakby zostały "
"ściągnięte oryginalne źródła programu ze strony jego autorów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
@@ -2954,7 +2986,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -2963,7 +2995,7 @@ msgstr ""
"bufor (cache) pakietów i szuka zepsutych pakietów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
@@ -2973,7 +3005,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2993,7 +3025,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3013,7 +3045,7 @@ msgstr ""
"zawierających zainstalowane pakiety."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for other packages and are "
@@ -3024,15 +3056,15 @@ msgstr ""
"pakietach, i nie są już potrzebne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
@@ -3047,7 +3079,7 @@ msgstr ""
"te dla polecenia <option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3056,7 +3088,7 @@ msgstr ""
"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -3066,7 +3098,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3077,7 +3109,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3105,9 +3137,9 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -3125,7 +3157,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3138,14 +3170,23 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
+#, fuzzy
+#| msgid ""
+#| "Quiet; produces output suitable for logging, omitting progress "
+#| "indicators. More q's will produce more quiet up to a maximum of 2. You "
+#| "can also use <option>-q=#</option> to set the quiet level, overriding the "
+#| "configuration file. Note that quiet level 2 implies <option>-y</option>, "
+#| "you should never use -qq without a no-action modifier such as -d, --print-"
+#| "uris or -s as APT may decided to do something you did not expect. "
+#| "Configuration Item: <literal>quiet</literal>."
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
"Cichy; wypisuje tylko informacje potrzebne do logowania, opuszczając "
@@ -3159,7 +3200,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3170,14 +3211,24 @@ msgstr ""
"Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
-msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+#: apt-get.8.xml:330
+#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatic. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true). Neither "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
+msgid ""
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
"Symulacja uruchomiona przez zwykłego użytkownika automatycznie wyłączy "
"blokady (<literal>Debug::NoLocking</literal>) . Jeżeli jest ustawiona opcja "
@@ -3190,12 +3241,19 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
"Symulacja powoduje wypisanie serii linii, z których każda reprezentuje "
"operację programu dpkg: konfigurowanie (Conf), usunięcie (Remv), "
@@ -3233,7 +3291,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
"Pokazuje uaktualnione pakiety. Wypisuje listę wszystkich pakietów, które "
@@ -3282,7 +3340,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -3297,7 +3355,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -3310,7 +3368,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -3324,7 +3382,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -3342,7 +3400,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3352,7 +3410,7 @@ msgid ""
msgstr ""
"Nie ściąga pakietów do zainstalowania, tylko wypisuje ich URI. Każdy URI "
"składa się z lokalizacji, nazwy pliku przeznaczenia, rozmiaru oraz "
-"oczekiwanej sumy kontrolnej md5. Należy zauważyć, że nazwa pliku "
+"oczekiwanej sumy kontrolnej MD5. Należy zauważyć, że nazwa pliku "
"przeznaczenia nie musi być taka sama jak nazwa zdalnego pliku! Działa to "
"także z poleceniami <literal>source</literal> i <literal>update</literal>. "
"Używane z poleceniem <literal>update</literal>, nie wypisuje sum MD5 i "
@@ -3379,7 +3437,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"Ponownie instaluje pakiety, których najnowsza wersja już jest zainstalowana "
@@ -3388,13 +3446,21 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
-msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+#, fuzzy
+#| msgid ""
+#| "This option defaults to on, use <literal>--no-list-cleanup</literal> to "
+#| "turn it off. When on <command>apt-get</command> will automatically manage "
+#| "the contents of <filename>&statedir;/lists</filename> to ensure that "
+#| "obsolete files are erased. The only reason to turn it off is if you "
+#| "frequently change your source list. Configuration Item: <literal>APT::"
+#| "Get::List-Cleanup</literal>."
+msgid ""
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
"Ta opcja jest domyślnie włączona, można ją wyłączyć używając <literal>--no-"
"list-cleanup</literal>. Jeżeli jest włączona, <command>apt-get</command> "
@@ -3405,9 +3471,9 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -3429,10 +3495,10 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
@@ -3444,7 +3510,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -3454,11 +3520,11 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
"Jeżeli polecenie to albo <literal>install</literal>, albo <literal>remove</"
@@ -3469,7 +3535,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3489,7 +3555,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3501,7 +3567,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -3512,7 +3578,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3524,7 +3590,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3536,7 +3602,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3766,12 +3832,12 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg --set-"
"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
+"effected by the <option>--file</option> option."
msgstr ""
"<literal>hold</literal> jest używane do wstrzymania pakietu, co zabroni "
"automatycznego instalowania, aktualizowania lub usuwania pakietu. Polecenie "
"jest nakładką na <command>dpkg --set-selections</command>, stan pakietu jest "
-"zarządzany przez &dpkg;, a opcja <option>--file</option> nie wpływa na "
+"zarządzany przez &dpkg;, a opcja <option>--file</option> nie wpływa na "
"działanie tego polecenia."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4823,8 +4889,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -5371,7 +5437,7 @@ msgstr ""
#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7222,10 +7288,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
-"Schemat cdrom pozwala APT na użycie lokalnego dysku CDROM ze zmianą dysków. "
+"Schemat cdrom pozwala APT na użycie lokalnego dysku CD-ROM ze zmianą dysków. "
"Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
"list."
@@ -7820,23 +7886,23 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
"Aby włączyć metodę APT należy wybrać opcję \"[A] Dostęp\" w programie "
"<prgn>dselect</prgn> , a następnie wybrać metodę APT. Użytkownik zostanie "
"poproszony o skonfigurowanie listy <em>źródeł</em>, będących lokalizacjami, "
"z których będą pobierane pakiety. Mogą być to strony internetowe, lokalne "
-"serwery lustrzane Debiana lub CDROM-y. Każde źródło może dostarczać tylko "
+"serwery lustrzane Debiana lub CD-ROM-y. Każde źródło może dostarczać tylko "
"fragmentu pełnego archiwum Debiana, a APT automatycznie połączy je w "
-"kompletny zbiór pakietów. Jeśli używany jest CDROM, to dobrym pomysłem jest "
+"kompletny zbiór pakietów. Jeśli używany jest CD-ROM, to dobrym pomysłem jest "
"podanie najpierw jego, a potem podanie mirrorów umożliwiających dostęp do "
"najnowszych wersji pakietów zawierających poprawki błędów. APT automatycznie "
-"użyje pakietów z CDROM-u zanim zacznie pobierać pakiety z Internetu."
+"użyje pakietów z CD-ROM-u zanim zacznie pobierać pakiety z Internetu."
#. type: <example></example>
#: guide.sgml:198
@@ -9000,59 +9066,6 @@ 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."
-#~ msgid "Debian GNU/Linux"
-#~ msgstr "Debian GNU/Linux"
-
-#~ msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-#~ msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#~ 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 października 2008</date>\n"
-#~ " <productname>Linux</productname>\n"
-#~ " </refentryinfo>\n"
-#~ "\">\n"
-
-#~| 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>04 February 2011</date>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#~ "<date>4 lutego 2011</date>"
-
-#~ msgid "apt-cache"
-#~ msgstr "apt-cache"
-
-#~ msgid "gencaches"
-#~ msgstr "gencaches"
-
#
#~ msgid ""
#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
@@ -9065,161 +9078,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ "podstawie źródeł wymienionych w &sources-list; oraz pliku <filename>/var/"
#~ "lib/dpkg/status</filename>."
-#~ msgid "showpkg <replaceable>pkg(s)</replaceable>"
-#~ msgstr "showpkg <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "stats"
-#~ msgstr "stats"
-
-#~ msgid "showsrc <replaceable>pkg(s)</replaceable>"
-#~ msgstr "showsrc <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "dump"
-#~ msgstr "dump"
-
-#~ msgid "dumpavail"
-#~ msgstr "dumpavail"
-
-#~ msgid "unmet"
-#~ msgstr "unmet"
-
-#~ msgid "show <replaceable>pkg(s)</replaceable>"
-#~ msgstr "show <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-#~ msgstr ""
-#~ "search <replaceable>wyrażenie regularne [ wyrażenie regularne ... ]</"
-#~ "replaceable>"
-
-#~ msgid "depends <replaceable>pkg(s)</replaceable>"
-#~ msgstr "depends <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "rdepends <replaceable>pkg(s)</replaceable>"
-#~ msgstr "rdepends <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "dotty <replaceable>pkg(s)</replaceable>"
-#~ msgstr "dotty <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "xvcg <replaceable>pkg(s)</replaceable>"
-#~ msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
-
-#~ msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-#~ msgstr "policy <replaceable>[ pakiet(y) ]</replaceable>"
-
-#~ msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-#~ msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
-
-#~ msgid "<option>-p</option>"
-#~ msgstr "<option>-p</option>"
-
-#~ msgid "<option>--pkg-cache</option>"
-#~ msgstr "<option>--pkg-cache</option>"
-
-#~ msgid "<option>-s</option>"
-#~ msgstr "<option>-s</option>"
-
-#~ msgid "<option>--src-cache</option>"
-#~ msgstr "<option>--src-cache</option>"
-
-#~ msgid "<option>-q</option>"
-#~ msgstr "<option>-q</option>"
-
-#~ msgid "<option>--quiet</option>"
-#~ msgstr "<option>--quiet</option>"
-
-#~ msgid "<option>-i</option>"
-#~ msgstr "<option>-i</option>"
-
-#~ msgid "<option>--important</option>"
-#~ msgstr "<option>--important</option>"
-
-#~| msgid "<option>--no-upgrade</option>"
-#~ msgid "<option>--no-pre-depends</option>"
-#~ msgstr "<option>--no-pre-depends</option>"
-
-#~| msgid "<option>--no-download</option>"
-#~ msgid "<option>--no-depends</option>"
-#~ msgstr "<option>--no-depends</option>"
-
-#~| msgid "<option>--install-recommends</option>"
-#~ msgid "<option>--no-recommends</option>"
-#~ msgstr "<option>--no-recommends</option>"
-
-#~| msgid "<option>--no-upgrade</option>"
-#~ msgid "<option>--no-suggests</option>"
-#~ msgstr "<option>--no-suggests</option>"
-
-#~| msgid "<option>--no-mount</option>"
-#~ msgid "<option>--no-conflicts</option>"
-#~ msgstr "<option>--no-conflicts</option>"
-
-#~| msgid "<option>--no-act</option>"
-#~ msgid "<option>--no-breaks</option>"
-#~ msgstr "<option>--no-breaks</option>"
-
-#~| msgid "<option>--no-act</option>"
-#~ msgid "<option>--no-replaces</option>"
-#~ msgstr "<option>--no-replaces</option>"
-
-#~| msgid "<option>--no-act</option>"
-#~ msgid "<option>--no-enhances</option>"
-#~ msgstr "<option>--no-enhances</option>"
-
-#~ msgid "<option>-f</option>"
-#~ msgstr "<option>-f</option>"
-
-#~ msgid "<option>--full</option>"
-#~ msgstr "<option>--full</option>"
-
-#~ msgid "<option>-a</option>"
-#~ msgstr "<option>-a</option>"
-
-#~ msgid "<option>--all-versions</option>"
-#~ msgstr "<option>--all-versions</option>"
-
-#~ msgid "<option>-g</option>"
-#~ msgstr "<option>-g</option>"
-
-#~ msgid "<option>--generate</option>"
-#~ msgstr "<option>--generate</option>"
-
-#~ msgid "<option>--names-only</option>"
-#~ msgstr "<option>--names-only</option>"
-
-#~ msgid "<option>-n</option>"
-#~ msgstr "<option>-n</option>"
-
-#~ msgid "<option>--all-names</option>"
-#~ msgstr "<option>--all-names</option>"
-
-#~ msgid "<option>--recurse</option>"
-#~ msgstr "<option>--recurse</option>"
-
-#~ msgid "<option>--installed</option>"
-#~ msgstr "<option>--installed</option>"
-
-#~ msgid "&apt-commonoptions;"
-#~ msgstr "&apt-commonoptions;"
-
-#~ msgid "&file-sourceslist; &file-statelists;"
-#~ msgstr "&file-sourceslist; &file-statelists;"
-
-#~ 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 "apt-cdrom"
-#~ msgstr "apt-cdrom"
-
-#~ msgid "add"
-#~ msgstr "add"
-
-#~ msgid "ident"
-#~ msgstr "ident"
-
#
#~ msgid ""
#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
@@ -9230,1073 +9088,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ "<option>-h</option> lub <option>--help</option>. <placeholder type="
#~ "\"variablelist\" id=\"0\"/>"
-#~ msgid "<option>-d</option>"
-#~ msgstr "<option>-d</option>"
-
-#~ msgid "<option>--cdrom</option>"
-#~ msgstr "<option>--cdrom</option>"
-
-#~ msgid "<option>-r</option>"
-#~ msgstr "<option>-r</option>"
-
-#~ msgid "<option>--rename</option>"
-#~ msgstr "<option>--rename</option>"
-
-#~ msgid "<option>-m</option>"
-#~ msgstr "<option>-m</option>"
-
-#~ msgid "<option>--no-mount</option>"
-#~ msgstr "<option>--no-mount</option>"
-
-#~ msgid "<option>--fast</option>"
-#~ msgstr "<option>--fast</option>"
-
-#~ msgid "<option>--thorough</option>"
-#~ msgstr "<option>--thorough</option>"
-
-#~ msgid "<option>--just-print</option>"
-#~ msgstr "<option>--just-print</option>"
-
-#~ msgid "<option>--recon</option>"
-#~ msgstr "<option>--recon</option>"
-
-#~ msgid "<option>--no-act</option>"
-#~ msgstr "<option>--no-act</option>"
-
-#~ 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-config"
-#~ msgstr "apt-config"
-
-#
-#~ 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>."
-
-#~ msgid "shell"
-#~ msgstr "shell"
-
-#~| msgid "<option>--help</option>"
-#~ msgid "<option>--empty</option>"
-#~ msgstr "<option>--empty</option>"
-
-#~ msgid "apt-extracttemplates"
-#~ msgstr "apt-extracttemplates"
-
-#~ msgid "<option>-t</option>"
-#~ msgstr "<option>-t</option>"
-
-#~ msgid "<option>--tempdir</option>"
-#~ msgstr "<option>--tempdir</option>"
-
-#~ 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 "apt-ftparchive"
-#~ msgstr "apt-ftparchive"
-
-#~ msgid "packages"
-#~ msgstr "packages"
-
-#~ msgid "sources"
-#~ msgstr "sources"
-
-#~ msgid "contents"
-#~ msgstr "contents"
-
-#~ msgid "release"
-#~ msgstr "release"
-
-#~ msgid "generate"
-#~ msgstr "generate"
-
-#~ msgid "clean"
-#~ msgstr "clean"
-
-#~ msgid "Dir Section"
-#~ msgstr "Dir Section"
-
-#~ msgid "ArchiveDir"
-#~ msgstr "ArchiveDir"
-
-#~ msgid "OverrideDir"
-#~ msgstr "OverrideDir"
-
-#~ msgid "CacheDir"
-#~ msgstr "CacheDir"
-
-#~ msgid "FileListDir"
-#~ msgstr "FileListDir"
-
-#~ msgid "Packages::Compress"
-#~ msgstr "Packages::Compress"
-
-#~ msgid "Packages::Extensions"
-#~ msgstr "Packages::Extensions"
-
-#~ msgid "Sources::Compress"
-#~ msgstr "Sources::Compress"
-
-#~ msgid "Sources::Extensions"
-#~ msgstr "Sources::Extensions"
-
-#~| msgid "Packages::Compress"
-#~ msgid "Translation::Compress"
-#~ msgstr "Translation::Compress"
-
-#~ msgid "DeLinkLimit"
-#~ msgstr "DeLinkLimit"
-
-#~ msgid "FileMode"
-#~ msgstr "FileMode"
-
-#~| msgid "Description"
-#~ msgid "LongDescription"
-#~ msgstr "LongDescription"
-
-#~ msgid "MaxContentsChange"
-#~ msgstr "MaxContentsChange"
-
-#~ msgid "ContentsAge"
-#~ msgstr "ContentsAge"
-
-#~ msgid "Directory"
-#~ msgstr "Directory"
-
-#~ msgid "SrcDirectory"
-#~ msgstr "SrcDirectory"
-
-#~ msgid "Packages"
-#~ msgstr "Packages"
-
-#~ msgid "Sources"
-#~ msgstr "Sources"
-
-#, fuzzy
-#~| msgid "Operation"
-#~ msgid "Translation"
-#~ msgstr "Kolejne kroki"
-
-#~ msgid "InternalPrefix"
-#~ msgstr "InternalPrefix"
-
-#~ msgid "Contents"
-#~ msgstr "Contents"
-
-#~ msgid "Contents::Header"
-#~ msgstr "Contents::Header"
-
-#~ msgid "BinCacheDB"
-#~ msgstr "BinCacheDB"
-
-#~ msgid "FileList"
-#~ msgstr "FileList"
-
-#~ msgid "SourceFileList"
-#~ msgstr "SourceFileList"
-
-#~ msgid "Sections"
-#~ msgstr "Sections"
-
-#, fuzzy
-#~ msgid "BinOverride"
-#~ msgstr "BinOverride"
-
-#~ msgid "SrcOverride"
-#~ msgstr "SrcOverride"
-
-#~ msgid "ExtraOverride"
-#~ msgstr "ExtraOverride"
-
-#~ msgid "SrcExtraOverride"
-#~ msgstr "SrcExtraOverride"
-
-#~ msgid "FileList, SourceFileList"
-#~ msgstr "FileList, SourceFileList"
-
-#~ msgid ""
-#~ "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-#~ msgstr ""
-#~ "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-
-#~ msgid "<option>--db</option>"
-#~ msgstr "<option>--db</option>"
-
-#~ msgid "<option>--delink</option>"
-#~ msgstr "<option>--delink</option>"
-
-#~ msgid "<option>--contents</option>"
-#~ msgstr "<option>--contents</option>"
-
-#~ msgid "<option>--source-override</option>"
-#~ msgstr "<option>--source-override</option>"
-
-#~ msgid "<option>--readonly</option>"
-#~ msgstr "<option>--readonly</option>"
-
-#~| msgid "<option>-a</option>"
-#~ msgid "<option>--arch</option>"
-#~ msgstr "<option>--arch</option>"
-
-#~ msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-#~ msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
-
-#~ msgid "<option>APT::FTPArchive::LongDescription</option>"
-#~ msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
-#~ 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 "update"
-#~ msgstr "update"
-
-#~ msgid "dselect-upgrade"
-#~ msgstr "dselect-upgrade"
-
-#~ msgid "remove"
-#~ msgstr "remove"
-
-#~ msgid "purge"
-#~ msgstr "purge"
-
-#~ msgid "source"
-#~ msgstr "source"
-
-#~ msgid "build-dep"
-#~ msgstr "build-dep"
-
-#~ msgid "check"
-#~ msgstr "check"
-
-#~ msgid "download"
-#~ msgstr "download"
-
-#~ msgid "autoclean"
-#~ msgstr "autoclean"
-
-#~ msgid "autoremove"
-#~ msgstr "autoremove"
-
-#~ msgid "changelog"
-#~ msgstr "changelog"
-
-#~ msgid "<option>--no-install-recommends</option>"
-#~ msgstr "<option>--no-install-recommends</option>"
-
-#~| msgid "<option>--no-upgrade</option>"
-#~ msgid "<option>--install-suggests</option>"
-#~ msgstr "<option>--install-suggests</option>"
-
-#~ msgid "<option>--download-only</option>"
-#~ msgstr "<option>--download-only</option>"
-
-#~ msgid "<option>--fix-broken</option>"
-#~ msgstr "<option>--fix-broken</option>"
-
-#~ msgid "<option>--ignore-missing</option>"
-#~ msgstr "<option>--ignore-missing</option>"
-
-#~ msgid "<option>--fix-missing</option>"
-#~ msgstr "<option>--fix-missing</option>"
-
-#~ msgid "<option>--no-download</option>"
-#~ msgstr "<option>--no-download</option>"
-
-#~ msgid "<option>--simulate</option>"
-#~ msgstr "<option>--simulate</option>"
-
-#~ msgid "<option>--dry-run</option>"
-#~ msgstr "<option>--dry-run</option>"
-
-#~ msgid "<option>-y</option>"
-#~ msgstr "<option>-y</option>"
-
-#~ msgid "<option>--yes</option>"
-#~ msgstr "<option>--yes</option>"
-
-#~ msgid "<option>--assume-yes</option>"
-#~ msgstr "<option>--assume-yes</option>"
-
-#~| msgid "<option>--assume-yes</option>"
-#~ msgid "<option>--assume-no</option>"
-#~ msgstr "<option>--assume-no</option>"
-
-#~ msgid "<option>-u</option>"
-#~ msgstr "<option>-u</option>"
-
-#~ msgid "<option>--show-upgraded</option>"
-#~ msgstr "<option>--show-upgraded</option>"
-
-#~ msgid "<option>-V</option>"
-#~ msgstr "<option>-V</option>"
-
-#~ msgid "<option>--verbose-versions</option>"
-#~ msgstr "<option>--verbose-versions</option>"
-
-#~| msgid "<option>--recurse</option>"
-#~ msgid "<option>--host-architecture</option>"
-#~ msgstr "<option>--host-architecture</option>"
-
-#~ msgid "<option>-b</option>"
-#~ msgstr "<option>-b</option>"
-
-#~ msgid "<option>--compile</option>"
-#~ msgstr "<option>--compile</option>"
-
-#~ msgid "<option>--build</option>"
-#~ msgstr "<option>--build</option>"
-
-#~ msgid "<option>--ignore-hold</option>"
-#~ msgstr "<option>--ignore-hold</option>"
-
-#~ msgid "<option>--no-upgrade</option>"
-#~ msgstr "<option>--no-upgrade</option>"
-
-#~| msgid "<option>--no-upgrade</option>"
-#~ msgid "<option>--only-upgrade</option>"
-#~ msgstr "<option>--only-upgrade</option>"
-
-#~ msgid "<option>--force-yes</option>"
-#~ msgstr "<option>--force-yes</option>"
-
-#~ msgid "<option>--print-uris</option>"
-#~ msgstr "<option>--print-uris</option>"
-
-#~ msgid "<option>--purge</option>"
-#~ msgstr "<option>--purge</option>"
-
-#~ msgid "<option>--reinstall</option>"
-#~ msgstr "<option>--reinstall</option>"
-
-#~ msgid "<option>--list-cleanup</option>"
-#~ msgstr "<option>--list-cleanup</option>"
-
-#~ msgid "<option>--target-release</option>"
-#~ msgstr "<option>--target-release</option>"
-
-#~ msgid "<option>--default-release</option>"
-#~ msgstr "<option>--default-release</option>"
-
-#~ msgid "<option>--trivial-only</option>"
-#~ msgstr "<option>--trivial-only</option>"
-
-#~ msgid "<option>--no-remove</option>"
-#~ msgstr "<option>--no-remove</option>"
-
-#~ msgid "<option>--auto-remove</option>"
-#~ msgstr "<option>--auto-remove</option>"
-
-#~ msgid "<option>--only-source</option>"
-#~ msgstr "<option>--only-source</option>"
-
-#~ msgid "<option>--diff-only</option>"
-#~ msgstr "<option>--diff-only</option>"
-
-#~ msgid "<option>--dsc-only</option>"
-#~ msgstr "<option>--dsc-only</option>"
-
-#~ msgid "<option>--tar-only</option>"
-#~ msgstr "<option>--tar-only</option>"
-
-#~ msgid "<option>--arch-only</option>"
-#~ msgstr "<option>--arch-only</option>"
-
-#~ msgid "<option>--allow-unauthenticated</option>"
-#~ msgstr "<option>--allow-unauthenticated</option>"
-
-#~ msgid ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-#~ msgstr ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-
-#~ msgid "ORIGINAL AUTHORS"
-#~ msgstr "AUTORZY ORYGINAŁU"
-
-#~ msgid "&apt-author.jgunthorpe;"
-#~ msgstr "&apt-author.jgunthorpe;"
-
-#~ msgid "CURRENT AUTHORS"
-#~ msgstr "OBECNI AUTORZY"
-
-#~ msgid "&apt-author.team;"
-#~ msgstr "&apt-author.team;"
-
-#~ msgid "apt-key"
-#~ msgstr "apt-key"
-
-#~ msgid "export &synopsis-param-keyid;"
-#~ msgstr "export &synopsis-param-keyid;"
-
-#~ msgid "exportall"
-#~ msgstr "exportall"
-
-#~ msgid "list"
-#~ msgstr "list"
-
-#~ msgid "finger"
-#~ msgstr "finger"
-
-#~ msgid "adv"
-#~ msgstr "adv"
-
-#~| msgid "update"
-#~ msgid "net-update"
-#~ msgstr "net-update"
-
-#~ msgid "--keyring &synopsis-param-filename;"
-#~ msgstr "--keyring &synopsis-param-filename;"
-
-#~ msgid "&file-trustedgpg;"
-#~ msgstr "&file-trustedgpg;"
-
-#~| 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>21 kwietnia 2011</date>"
-
-#~ msgid "apt-mark"
-#~ msgstr "apt-mark"
-
-#~| msgid "markauto"
-#~ msgid "auto"
-#~ msgstr "auto"
-
-#~ msgid "manual"
-#~ msgstr "manual"
-
-#~ msgid "hold"
-#~ msgstr "hold"
-
-#~ msgid "unhold"
-#~ msgstr "unhold"
-
-#~ msgid "showauto"
-#~ msgstr "showauto"
-
-#~| msgid "showauto"
-#~ msgid "showmanual"
-#~ msgstr "showmanual"
-
-#~| msgid "showauto"
-#~ msgid "showhold"
-#~ msgstr "showhold"
-
-#~ msgid ""
-#~ "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></"
-#~ "option>"
-#~ msgstr ""
-#~ "<option>-f=<filename><replaceable>nazwa-pliku</replaceable></filename></"
-#~ "option>"
-
-#~ msgid ""
-#~ "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-#~ "option>"
-#~ msgstr ""
-#~ "<option>--file=<filename><replaceable>NAZWA_PLIKU</replaceable></"
-#~ "filename></option>"
-
-#~ msgid " &file-extended_states;"
-#~ msgstr " &file-extended_states;"
-
-#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
-#~ msgstr "&apt-get;,&aptitude;,&apt-conf;"
-
-#~ msgid "apt-secure"
-#~ msgstr "apt-secure"
-
-#~ msgid "apt-sortpkgs"
-#~ msgstr "apt-sortpkgs"
-
-#~ msgid "<option>--source</option>"
-#~ msgstr "<option>--source</option>"
-
-#~ 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>"
-#~ msgstr ""
-#~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#~ "firstname> <surname>Burrows</surname> <contrib>Pierwsza dokumentacjan of "
-#~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#~ "email; &apt-product; <date>16 stycznia 2010</date>"
-
-#~ msgid "apt.conf"
-#~ msgstr "apt.conf"
-
-#~ msgid "Default-Release"
-#~ msgstr "Default-Release"
-
-#~ msgid "Ignore-Hold"
-#~ msgstr "Ignore-Hold"
-
-#, fuzzy
-#~ msgid "Clean-Installed"
-#~ msgstr "B<--installed>"
-
-#~ msgid "Build-Essential"
-#~ msgstr "Build-Essential"
-
-#~ msgid "Get"
-#~ msgstr "Get"
-
-#~ msgid "Cache"
-#~ msgstr "Cache"
-
-#~ msgid "CDROM"
-#~ msgstr "CDROM"
-
-#~ msgid "Max-ValidTime"
-#~ msgstr "Max-ValidTime"
-
-#, fuzzy
-#~ msgid "Source-Symlinks"
-#~ msgstr "Sources"
-
-#~ msgid "http"
-#~ msgstr "http"
-
-#~ msgid "https"
-#~ msgstr "https"
-
-#~ msgid "ftp"
-#~ msgstr "ftp"
-
-#~ msgid "cdrom"
-#~ msgstr "cdrom"
-
-#~ msgid "gpgv"
-#~ msgstr "gpgv"
-
-#, fuzzy
-#~ msgid "Clean"
-#~ msgstr "B<clean>"
-
-#, fuzzy
-#~ msgid "Updateoptions"
-#~ msgstr "opcje"
-
-#, fuzzy
-#~ msgid "Build-options"
-#~ msgstr "opcje"
-
-#~ msgid "DPkg::NoTriggers"
-#~ msgstr "DPkg::NoTriggers"
-
-#~ msgid "PackageManager::Configure"
-#~ msgstr "PackageManager::Configure"
-
-#~ msgid "DPkg::ConfigurePending"
-#~ msgstr "DPkg::ConfigurePending"
-
-#~ msgid "DPkg::TriggersPending"
-#~ msgstr "DPkg::TriggersPending"
-
-#~ msgid "PackageManager::UnpackAll"
-#~ msgstr "PackageManager::UnpackAll"
-
-#~ msgid "OrderList::Score::Immediate"
-#~ msgstr "OrderList::Score::Immediate"
-
-#~ msgid "<literal>Debug::Acquire::cdrom</literal>"
-#~ msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
-#~ msgid "<literal>Debug::Acquire::ftp</literal>"
-#~ msgstr "<literal>Debug::Acquire::ftp</literal>"
-
-#~ msgid "<literal>Debug::Acquire::http</literal>"
-#~ msgstr "<literal>Debug::Acquire::http</literal>"
-
-#~ msgid "<literal>Debug::Acquire::https</literal>"
-#~ msgstr "<literal>Debug::Acquire::https</literal>"
-
-#~ msgid "<literal>Debug::Acquire::gpgv</literal>"
-#~ msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
-#~ msgid "<literal>Debug::aptcdrom</literal>"
-#~ msgstr "<literal>Debug::aptcdrom</literal>"
-
-#~ msgid "<literal>Debug::BuildDeps</literal>"
-#~ msgstr "<literal>Debug::BuildDeps</literal>"
-
-#~ msgid "<literal>Debug::Hashes</literal>"
-#~ msgstr "<literal>Debug::Hashes</literal>"
-
-#~ msgid "<literal>Debug::IdentCDROM</literal>"
-#~ msgstr "<literal>Debug::IdentCDROM</literal>"
-
-#~ msgid "<literal>Debug::NoLocking</literal>"
-#~ msgstr "<literal>Debug::NoLocking</literal>"
-
-#~ msgid "<literal>Debug::pkgAcquire</literal>"
-#~ msgstr "<literal>Debug::pkgAcquire</literal>"
-
-#~ msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-#~ msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
-#~ msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-#~ msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
-#~ msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-#~ msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
-#~ msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-#~ msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
-#~ msgid "<literal>Debug::pkgAutoRemove</literal>"
-#~ msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
-#~ msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-#~ msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
-#~ msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-#~ msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
-#~ msgid "<literal>Debug::pkgInitConfig</literal>"
-#~ msgstr "<literal>Debug::pkgInitConfig</literal>"
-
-#~ msgid "<literal>Debug::pkgDPkgPM</literal>"
-#~ msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
-#~ msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-#~ msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
-#~ msgid "<literal>Debug::pkgOrderList</literal>"
-#~ msgstr "<literal>Debug::pkgOrderList</literal>"
-
-#~ msgid "<literal>Debug::pkgPackageManager</literal>"
-#~ msgstr "<literal>Debug::pkgPackageManager</literal>"
-
-#~ msgid "<literal>Debug::pkgPolicy</literal>"
-#~ msgstr "<literal>Debug::pkgPolicy</literal>"
-
-#~ msgid "<literal>Debug::pkgProblemResolver</literal>"
-#~ msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
-#~ msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-#~ msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
-#~ msgid "<literal>Debug::sourceList</literal>"
-#~ msgstr "<literal>Debug::sourceList</literal>"
-
-#~ msgid "&file-aptconf;"
-#~ msgstr "&file-aptconf;"
-
-#~| msgid ""
-#~| "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
-#~ msgid ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-#~ msgstr ""
-#~ "&apt-author.team; &apt-email; &apt-product; <date>16 lutego 2010</date>"
-
-#~ msgid "apt_preferences"
-#~ msgstr "apt_preferences"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "&file-preferences;"
-#~ msgstr "&file-preferences;"
-
-#~ msgid "sources.list"
-#~ msgstr "sources.list"
-
-#~ msgid "file"
-#~ msgstr "file"
-
-#~ msgid "copy"
-#~ msgstr "copy"
-
-#~ msgid "rsh"
-#~ msgstr "rsh"
-
-#~ msgid "ssh"
-#~ msgstr "ssh"
-
-#~ 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\"/>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
-#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
-#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
-#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-#~ msgid ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
-#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
-#~ "<group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>plik</replaceable></arg></arg> <arg>gencaches</arg> "
-#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>stats</arg> "
-#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~ "choice=\"plain\"><replaceable>wyrażenie-regularne</replaceable></arg></"
-#~ "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>rdepends <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
-#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefiks</"
-#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
-#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiety</"
-#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiety</replaceable></arg></arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>punkt montowania CD-ROM-u</replaceable></"
-#~ "option></arg> <arg><option>-o=<replaceable>opcja konfiguracji</"
-#~ "replaceable></option></arg> <arg><option>-c=<replaceable>plik</"
-#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>identyfikator</"
-#~ "arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>opcja konfiguracji</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
-#~ "<group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>katalog_tymczasowy</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</"
-#~ "replaceable></arg>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~| "arg> <arg><option>-o <replaceable>config</"
-#~| "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~| "replaceable></arg><arg><replaceable>override</"
-#~| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" "
-#~| "rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
-#~| "<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
-#~| "</group>"
-#~ msgid ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>-o <replaceable>opcja_konfiguracji</"
-#~ "replaceable>=<replaceable>łańcuch_znaków</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>plik</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>ścieżka</replaceable></"
-#~ "arg><arg><replaceable>plik_nadpisań</"
-#~ "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
-#~ "arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>ścieżka</replaceable></"
-#~ "arg><arg><replaceable>plik_nadpisań</"
-#~ "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
-#~ "arg> <arg>contents <arg choice=\"plain\"><replaceable>ścieżka</"
-#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
-#~ "\"><replaceable>ścieżka</replaceable></arg></arg> <arg>generate <arg "
-#~ "choice=\"plain\"><replaceable>plik_konfiguracji</replaceable></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>sekcja</replaceable></arg></"
-#~ "arg> <arg>clean <arg choice=\"plain\"><replaceable>plik_konfiguracji</"
-#~ "replaceable></arg></arg> </group>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
-#~| "arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-#~| "choice='plain'> <replaceable>target_release_name</replaceable> </arg> "
-#~| "<arg choice='plain'> <replaceable>target_release_number_expression</"
-#~| "replaceable> </arg> <arg choice='plain'> "
-#~| "<replaceable>target_release_codename</replaceable> </arg> </group> </"
-#~| "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#~| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#~| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~| "<group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#~| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#~| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
-#~| "<arg> <group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#~| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#~| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> "
-#~| "<arg choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> "
-#~| "<arg choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> "
-#~| "<arg choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~| "help</arg> </group> </arg> </group>"
-#~ msgid ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>opcja_konfiguracji</replaceable> </option> </"
-#~ "arg> <arg> <option>-c= <replaceable>plik_konfiguracyjny</replaceable> </"
-#~ "option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-#~ "choice='plain'> <replaceable>nazwa_wydania</replaceable> </arg> <arg "
-#~ "choice='plain'> <replaceable>wyrażenie_numeru_wydania</replaceable> </"
-#~ "arg> <arg choice='plain'> <replaceable>kod_wydania</replaceable> </arg> </"
-#~ "group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> "
-#~ "<arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</"
-#~ "arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> "
-#~ "<arg> <group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>numer_wersji_pakietu</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </group> </"
-#~ "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pakiet</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg "
-#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>numer_wersji_pakietu</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
-#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-#~ msgstr ""
-#~ "<command>apt-key</command> <arg><option>--keyring "
-#~ "<replaceable>nazwa_pliku</replaceable></option></arg> "
-#~ "<arg><replaceable>polecenie</replaceable></arg> <arg rep=\"powtórzenia"
-#~ "\"><option><replaceable>argumenty</replaceable></option></arg>"
-
-#~ msgid "add <replaceable>filename</replaceable>"
-#~ msgstr "add <replaceable>nazwa_pliku</replaceable>"
-
-#~ msgid "del <replaceable>keyid</replaceable>"
-#~ msgstr "del <replaceable>id_klucza</replaceable>"
-
-#~ msgid "export <replaceable>keyid</replaceable>"
-#~ msgstr "export <replaceable>id_klucza</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."
-#~ msgstr ""
-#~ "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
-#~ "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów "
-#~ "Debiana."
-
-#~ msgid "--keyring <replaceable>filename</replaceable>"
-#~ msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
-
-#, fuzzy
-#~| msgid ""
-#~| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
-#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-#~ msgid ""
-#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> </group>"
-#~ msgstr ""
-#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> "
-#~ "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~ "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~ "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
-
-#~ msgid "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#
-#~ msgid "Show a short usage summary."
-#~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-#
-#~ msgid "Show the program version."
-#~ msgstr "Wyświetla wersję programu."
-
#
#~ msgid "APT package handling utility -- cache manipulator"
#~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
@@ -10312,9 +9103,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ "<literal>add</literal> dodaje pliki zawierające indeks nazw pakietów do "
#~ "bufora. Ta opcja jest przydatna głównie w celu odpluskwiania."
-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-
#~ msgid "Also install recommended packages."
#~ msgstr "Instaluje również rekomendowane pakiety."
@@ -10329,26 +9117,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ "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"
-
-#
-#~ msgid "None."
-#~ msgstr "Brak."
-
-#~ 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 "
#~ "<filename>extended_states</filename> file."
@@ -10356,10 +9124,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>."
-
-#, fuzzy
-#~ msgid "Cache-Limit"
-#~ msgstr "Cache"
-
-#~ 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 eed14a804..a28095e54 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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+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"
@@ -1251,7 +1251,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr "opções"
@@ -1411,14 +1411,14 @@ msgstr ""
"<literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1432,7 +1432,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr "Diagnóstico"
@@ -1448,18 +1448,18 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "Utilitário de gestão de CDROM do APT"
+msgid "APT CD-ROM management utility"
+msgstr "Utilitário de gestão de CD-ROM do APT"
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
msgstr ""
-"O <command>apt-cdrom</command> é usado para adicionar um novo CDROM à lista "
+"O <command>apt-cdrom</command> é usado para adicionar um novo CD-ROM à lista "
"de fontes disponíveis do APT. O <command>apt-cdrom</command> encarrega-se de "
"determinar a estrutura do disco assim como corrigir várias falhas possíveis "
"e verificar os ficheiros de índice."
@@ -1468,7 +1468,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"É necessário usar o <command>apt-cdrom</command> para adicionar CDs ao "
@@ -1480,25 +1480,25 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
"<literal>add</literal> é usado para adicionar um novo disco à lista de "
-"fontes. Irá desmontar o dispositivo CDROM, pedir que seja inserido um disco "
+"fontes. Irá desmontar o dispositivo CD-ROM, pedir que seja inserido um disco "
"e depois prosseguir com a sua sondagem e cópia dos ficheiros índice. Se o "
-"disco não possuir um directório <filename>disk</filename> apropriado, ser-"
+"disco não possuir um directório <filename>.disk</filename> apropriado, ser-"
"lhe-à pedido um título descritivo."
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"O APT usa um ID de CDROM para acompanhar qual disco está actualmente na "
+"O APT usa um ID de CD-ROM para acompanhar qual disco está actualmente na "
"drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
"list</filename>"
@@ -1519,7 +1519,7 @@ msgstr "Opções"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1531,9 +1531,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
"Renomear um disco; muda a etiqueta de um disco ou sobrepõe a etiqueta "
"fornecida do disco. Esta opção irá fazer com que o <command>apt-cdrom</"
@@ -1611,7 +1611,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
"<command>apt-config</command> é um programa interno usado por várias partes "
"da suite APT para fornecer uma configurabilidade consistente. Acede ao "
@@ -1620,12 +1620,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:51
+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value. In a shell "
+#| "script it should be used like:"
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
"shell é usado para aceder à informação de configuração a partir de um script "
"shell. É fornecido pares de argumentos, sendo o primeiro uma variável de "
@@ -1687,12 +1694,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1717,10 +1723,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Utilitário para extrair configurações e modelos DebConf a partir de pacotes "
-"Debian"
+"Utilitário para extrair configurações e modelos <command>debconf</command> a "
+"partir de pacotes Debian"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1760,13 +1768,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
-msgstr ""
-"Directório temporário para onde escrever ficheiros debconf modelo extraídos "
-"e scripts de configuração. Item de Configuração: <literal>APT::"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
"ExtractTemplates::TempDir</literal>"
+msgstr ""
+"Directório temporário para onde escrever ficheiros <command>debconf</"
+"command> modelo extraídos e scripts de configuração. Item de Configuração: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2822,31 +2830,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> é usado em conjunto com o front-end de "
-"pacotes Debian tradicional, &dselect;. <literal>dselect-upgrade</literal> "
-"segue as alterações feitas pelo &dselect; ao campo <literal>Status</literal> "
-"dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
-"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
"<literal>dist-upgrade</literal> adicionalmente a executar a função do "
"<literal>upgrade</literal>, também lida inteligentemente com as alterações "
@@ -2860,16 +2853,33 @@ msgstr ""
"sobrepor as definições gerais em pacotes individuais."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> é usado em conjunto com o front-end de "
+"pacotes Debian tradicional, &dselect;. <literal>dselect-upgrade</literal> "
+"segue as alterações feitas pelo &dselect; ao campo <literal>Status</literal> "
+"dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
+"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2877,15 +2887,16 @@ msgstr ""
"<literal>install</literal> é seguido por um ou mais pacotes desejados para "
"instalação ou actualização. Cada pacote é um nome de pacote, não um nome de "
"ficheiro completamente qualificado (por exemplo, num sistema Debian GNU/"
-"Linux, libc6 seria o argumento fornecido e não <literal>libc6_1.9.6-2.deb</"
-"literal>). Todos os pacotes necessários pelos pacotes especificados para "
-"instalação irão também ser obtidos e instalados. O ficheiro <filename>/etc/"
-"apt/sources.list</filename> é usado para localizar os pacotes desejados. Se "
-"for acrescentado um sinal menos (-) ao nome do pacote (sem nenhum espaço a "
-"separar), o pacote identificado irá ser removido se estiver instalado. À "
-"semelhança, um sinal mais (+) pode ser usado para designar um pacote a "
-"instalar. Estas últimas funcionalidades podem ser usadas para sobrepor "
-"decisões feitas pelo sistema de resolução de conflitos do apt-get."
+"Linux, <package>apt-utils</package> seria o argumento fornecido e não "
+"<filename>apt-utils_&apt-product-version;_amd64.deb</filename>). Todos os "
+"pacotes necessários pelos pacotes especificados para instalação irão também "
+"ser obtidos e instalados. O ficheiro <filename>/etc/apt/sources.list</"
+"filename> é usado para localizar os pacotes desejados. Se for acrescentado "
+"um sinal menos (-) ao nome do pacote (sem nenhum espaço a separar), o pacote "
+"identificado irá ser removido se estiver instalado. À semelhança, um sinal "
+"mais (+) pode ser usado para designar um pacote a instalar. Estas últimas "
+"funcionalidades podem ser usadas para sobrepor decisões feitas pelo sistema "
+"de resolução de conflitos do apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:116
@@ -2965,9 +2976,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
"<literal>remove</literal> é idêntico a <literal>install</literal> à "
@@ -3008,12 +3019,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:172
+#, fuzzy
+#| msgid ""
+#| "Source packages are tracked separately from binary packages via "
+#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
+#| "means that you will need to add such a line for each repository you want "
+#| "to get sources from. If you don't do this you will probably get another "
+#| "(newer, older or none) source version than the one you have installed or "
+#| "could install."
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
"Os pacotes fonte são acompanhados em separado dos pacotes binários via linha "
"do tipo <literal>deb-src</literal> no ficheiro &sources-list;. Isto quer "
@@ -3023,7 +3042,7 @@ msgstr ""
"instalada ou pode instalar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
#, fuzzy
#| msgid ""
#| "If the <option>--compile</option> option is specified then the package "
@@ -3043,7 +3062,7 @@ msgstr ""
"pacote fonte não será desempacotado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3058,18 +3077,23 @@ msgstr ""
"Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
+#, fuzzy
+#| msgid ""
+#| "Note that source packages are not tracked like binary packages, they "
+#| "exist only in the current directory and are similar to downloading source "
+#| "tar balls."
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
"Note que os pacotes fonte não são acompanhados como pacotes binários, eles "
"existem apenas no directório actual e são semelhantes à descarga de tar "
"balls fonte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
#, fuzzy
#| msgid ""
#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3085,7 +3109,7 @@ msgstr ""
"tentativa de satisfazer dependências de compilação para um pacote fonte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3094,14 +3118,14 @@ msgstr ""
"de pacotes e verifica por dependências quebradas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3120,7 +3144,7 @@ msgstr ""
"libertar espaço do disco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3139,7 +3163,7 @@ msgstr ""
"pacotes instalados sejam apagados se estiver definida para 'off'."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
#, fuzzy
#| msgid ""
#| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3155,21 +3179,21 @@ msgstr ""
"que já não são necessários."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3178,7 +3202,7 @@ msgstr ""
"de Configuração: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -3191,7 +3215,7 @@ msgstr ""
"de Configuração: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3201,7 +3225,7 @@ msgstr ""
"Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3229,9 +3253,9 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -3248,7 +3272,7 @@ msgstr ""
"de Configuração: <literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3259,14 +3283,14 @@ msgstr ""
"descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
"Silencioso; produz saída apropriada para registar em log, omitindo "
@@ -3279,7 +3303,7 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3290,14 +3314,24 @@ msgstr ""
"Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
-msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+#: apt-get.8.xml:330
+#, fuzzy
+#| msgid ""
+#| "Simulation run as user will deactivate locking (<literal>Debug::"
+#| "NoLocking</literal>) automatic. Also a notice will be displayed "
+#| "indicating that this is only a simulation, if the option <literal>APT::"
+#| "Get::Show-User-Simulation-Note</literal> is set (Default: true). Neither "
+#| "NoLocking nor the notice will be triggered if run as root (root should "
+#| "know what he is doing without further warnings by <literal>apt-get</"
+#| "literal>)."
+msgid ""
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
"Uma simulação corrida como utilizador irá automaticamente desactivar o "
"bloqueio (<literal>Debug::NoLocking</literal>). Também será mostrado um "
@@ -3308,12 +3342,19 @@ msgstr ""
"get</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
+#, fuzzy
+#| msgid ""
+#| "Simulate prints out a series of lines each one representing a dpkg "
+#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
+#| "brackets indicate broken packages and empty set of square brackets "
+#| "meaning breaks that are of no consequence (rare)."
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
"A simulação escreve uma série de linhas cada uma representando uma operação "
"do dpkg, Configurar (Conf), Remover (Remv), Desempacotar (Inst). Parênteses "
@@ -3352,7 +3393,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
"Mostra pacotes actualizados; Escreve uma lista de todos os pacotes que estão "
@@ -3391,7 +3432,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -3404,7 +3445,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -3418,12 +3459,12 @@ msgstr ""
#: apt-get.8.xml:400
#, fuzzy
#| msgid ""
-#| "Do not install new packages; When used in conjunction with "
+#| "Do not install new packages; when used in conjunction with "
#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
#| "packages on the command line from being upgraded if they are not already "
#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -3436,7 +3477,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -3452,7 +3493,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3461,7 +3502,7 @@ msgid ""
"Print-URIs</literal>."
msgstr ""
"Ao invés de ir buscar os ficheiros para instalar, escreve os seus URIs. Cada "
-"URI irá ter o caminho, o nome de ficheiro de destino, o tamanho e o hash md5 "
+"URI irá ter o caminho, o nome de ficheiro de destino, o tamanho e o hash MD5 "
"esperado. Note que o nome de ficheiro a escrever nem sempre irá condizer com "
"o nome do ficheiro no site remoto! Isto também funciona com os comandos "
"<literal>source</literal> e <literal>update</literal>. Quando usado com o "
@@ -3485,7 +3526,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"Re-instala pacotes que já estão instalados e na versão mais recente. Item de "
@@ -3493,13 +3534,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
-msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+#, fuzzy
+#| msgid ""
+#| "This option defaults to on, use <literal>--no-list-cleanup</literal> to "
+#| "turn it off. When on <command>apt-get</command> will automatically manage "
+#| "the contents of <filename>&statedir;/lists</filename> to ensure that "
+#| "obsolete files are erased. The only reason to turn it off is if you "
+#| "frequently change your source list. Configuration Item: <literal>APT::"
+#| "Get::List-Cleanup</literal>."
+msgid ""
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
"A predefinição desta opção é ligada, use <literal>--no-list-cleanup</"
"literal> para a desligar. Quando ligada o <command>apt-get</command> irá "
@@ -3509,9 +3558,9 @@ msgstr ""
"fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -3532,10 +3581,10 @@ msgstr ""
"Release</literal>; veja também o manual &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
@@ -3546,7 +3595,7 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -3556,11 +3605,11 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
"Se o comando for <literal>install</literal> ou <literal>remove</literal>, "
@@ -3569,7 +3618,7 @@ msgstr ""
"Configuração: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3588,7 +3637,7 @@ msgstr ""
"<literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3599,7 +3648,7 @@ msgstr ""
"Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -3608,7 +3657,7 @@ msgstr ""
"de Configuração: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3619,7 +3668,7 @@ msgstr ""
"Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3630,7 +3679,7 @@ msgstr ""
"&guidesdir;, &apt-preferences;, o Howto do APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3870,7 +3919,7 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg --set-"
"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
+"effected by the <option>--file</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5282,8 +5331,8 @@ msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -5291,9 +5340,9 @@ msgid ""
"cdrom block. It is important to have the trailing slash. Unmount commands "
"can be specified using UMount."
msgstr ""
-"CDROM URIs; a única definição para URIs de CDROM é o ponto de montagem, "
+"CD-ROM URIs; a única definição para URIs de CD-ROM é o ponto de montagem, "
"<literal>cdrom::Mount</literal> que deve ser o ponto de montagem para a "
-"drive de CDROM como especificado em <filename>/etc/fstab</filename>. É "
+"drive de CD-ROM como especificado em <filename>/etc/fstab</filename>. É "
"possível fornecer comandos de montar e desmontar alternativos se o seu ponto "
"de montagem não puder ser listado na fstab (como uma montagem SMB e pacotes "
"de montagem antiga). A sintaxe é colocar <placeholder type=\"literallayout"
@@ -6108,10 +6157,10 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> desactiva a inclusão de dados statfs em "
-"IDs de CDROM."
+"IDs de CD-ROM."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:785
@@ -8061,10 +8110,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
-"O esquema cdrom permite ao APT usar uma drive de CDROM local com mudança de "
+"O esquema cdrom permite ao APT usar uma drive de CD-ROM local com mudança de "
"media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
"fontes."
@@ -8676,23 +8725,23 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
"Para activar o método APT você precisa de seleccionar [A]ccess no "
"<prgn>dselect</prgn> e depois escolher o método APT. Ser-lhe-à perguntado "
"por um conjunto de <em>Sources</em> que são os lugares de onde obter os "
"arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais "
-"ou CDROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
+"ou CD-ROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
"total. O APT irá automaticamente combiná-los para formar um conjunto "
-"completo de pacotes. Se tem um CDROM, então é boa ideia especificá-lo em "
+"completo de pacotes. Se tem um CD-ROM, então é boa ideia especificá-lo em "
"primeiro lugar e depois especificar um mirror para ter acesso às correcções "
-"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu "
-"CDROM antes de descarregar da Internet."
+"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu CD-"
+"ROM antes de descarregar da Internet."
#. type: <example></example>
#: guide.sgml:198
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 396e0f098..f302127bf 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-24 15:57+0300\n"
+"POT-Creation-Date: 2012-06-02 18:01+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"
@@ -952,7 +952,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
#: apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
@@ -1060,14 +1060,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
#: apt-cache.8.xml:350 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-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
#: 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
@@ -1082,7 +1082,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:355 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-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
@@ -1096,13 +1096,13 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-cdrom.8.xml:38
msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
@@ -1112,7 +1112,7 @@ msgstr ""
#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
@@ -1120,16 +1120,16 @@ msgstr ""
#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
"title."
msgstr ""
#. 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 "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
@@ -1149,7 +1149,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
@@ -1157,9 +1157,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 "
-"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1219,7 +1219,7 @@ msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1227,9 +1227,9 @@ msgstr ""
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value. In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present. In a shell script it should be used as "
+"follows:"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
@@ -1277,12 +1277,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option. Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value. Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1309,7 +1308,9 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1340,9 +1341,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -2114,6 +2115,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
+"<literal>dist-upgrade</literal> in addition to performing the function of "
+"<literal>upgrade</literal>, also intelligently handles changing dependencies "
+"with new versions of packages; <command>apt-get</command> has a \"smart\" "
+"conflict resolution system, and it will attempt to upgrade the most "
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
"literal> follows the changes made by &dselect; to the <literal>Status</"
@@ -2123,30 +2139,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
-"<literal>dist-upgrade</literal> in addition to performing the function of "
-"<literal>upgrade</literal>, also intelligently handles changing dependencies "
-"with new versions of packages; <command>apt-get</command> has a \"smart\" "
-"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
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 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 "
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). 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."
@@ -2205,9 +2208,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
@@ -2235,14 +2238,14 @@ msgstr ""
#: apt-get.8.xml:172
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2252,7 +2255,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2262,15 +2265,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
@@ -2280,21 +2283,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2306,7 +2309,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2318,7 +2321,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for other packages and are "
@@ -2326,42 +2329,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
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 url=\"http://packages.debian.org/changelogs"
-"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
-"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">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."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -2377,9 +2380,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with <option>-f</"
"option> may produce an error in some situations. If a package is selected "
@@ -2389,7 +2392,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -2397,19 +2400,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -2417,23 +2420,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:330
msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2456,7 +2461,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
@@ -2488,7 +2493,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -2497,7 +2502,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
@@ -2506,7 +2511,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
+"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@ -2515,7 +2520,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
@@ -2526,7 +2531,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the <literal>update</"
@@ -2547,25 +2552,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in <filename>/etc/apt/preferences</"
"filename>. Specifically pinned packages are not affected by the value of "
@@ -2577,32 +2582,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -2614,7 +2619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -2622,14 +2627,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -2637,7 +2642,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -2645,7 +2650,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -3729,8 +3734,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:430
msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
"provide alternate mount and unmount commands if your mount point cannot be "
"listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -4265,7 +4270,7 @@ msgstr ""
#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6068,7 +6073,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:154
msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
@@ -6509,12 +6514,12 @@ msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
msgstr ""
#. type: <example></example>
diff --git a/doc/po4a.conf b/doc/po4a.conf
index c9df1f9ac..3a8d7516b 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -7,8 +7,8 @@
-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>'"
+ -o inline='<para><option> <refentrytitle> <para><command> <programlisting><command> <refentrytitle><command> <refpurpose><command>' \
+ -o translated='<para><command> <programlisting><command> <refentrytitle><command> <refpurpose><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 93bbb478d..d132b399c 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -151,7 +151,7 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
<varlistentry><term><command>cdrom</command></term>
<listitem><para>
- The cdrom scheme allows APT to use a local CDROM drive with media
+ The cdrom scheme allows APT to use a local CD-ROM drive with media
swapping. Use the &apt-cdrom; program to create cdrom entries in the
source list.</para></listitem>
</varlistentry>
diff --git a/prepare-release b/prepare-release
index c5e28edc3..73c0be602 100755
--- a/prepare-release
+++ b/prepare-release
@@ -40,6 +40,7 @@ if [ "$1" = 'pre-export' ]; then
fi
sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in
+ sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
elif [ "$1" = 'post-build' ]; then
if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
echo >&2 "REMEMBER: Tag this release with »bzr tag ${VERSION}« if you are satisfied"