summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--doc/apt-verbatim.ent8
-rw-r--r--doc/apt.conf.5.xml4
-rw-r--r--doc/apt_preferences.5.xml63
-rw-r--r--doc/po/apt-doc.pot78
-rw-r--r--doc/po/de.po133
-rw-r--r--doc/po/es.po125
-rw-r--r--doc/po/fr.po178
-rw-r--r--doc/po/it.po75
-rw-r--r--doc/po/ja.po125
-rw-r--r--doc/po/pl.po134
-rw-r--r--doc/po/pt.po135
-rw-r--r--doc/po/pt_BR.po75
-rw-r--r--doc/sources.list.5.xml4
14 files changed, 645 insertions, 497 deletions
diff --git a/debian/changelog b/debian/changelog
index 043e7840f..fb60dc23d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,9 +29,8 @@ apt (0.9.5.2) UNRELEASED; urgency=low
- review and fix spelling issues
* doc/apt-ftparchive.8.xml:
- fix typo, grammar and style issues
- * doc/apt-key.8.xml:
- - review and fix spelling issues
- * doc/apt-mark.8.xml:
+ * doc/apt-key.8.xml, doc/apt-mark.8.xml,
+ doc/apt_preferences.5.xml:
- review and fix spelling issues
[ Robert Luberda ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 617403116..036986a15 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -166,6 +166,12 @@
</citerefentry>"
>
+<!ENTITY glob "<citerefentry>
+ <refentrytitle><abbrev>glob</abbrev></refentrytitle>
+ <manvolnum>7</manvolnum>
+ </citerefentry>"
+>
+
<!-- Boiler plate docinfo section -->
<!ENTITY apt-email "
<address>
@@ -213,6 +219,8 @@
<!ENTITY oldstable-codename "lenny">
<!ENTITY stable-codename "squeeze">
<!ENTITY testing-codename "wheezy">
+<!ENTITY stable-version "6.0">
+<!ENTITY ubuntu-codename "precise">
<!-- Arguments -->
<!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 299cc7b2a..d2784501e 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -52,8 +52,8 @@
alphanumeric ascending order which have either no or "<literal>conf</literal>"
as filename extension and which only contain alphanumeric,
hyphen (-), underscore (_) and period (.) characters.
- Otherwise APT will print a notice that it has ignored a file if the file
- doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
+ Otherwise APT will print a notice that it has ignored a file, unless that
+ file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
configuration list - in this case it will be silently ignored.</para></listitem>
<listitem><para>the main configuration file specified by
<literal>Dir::Etc::main</literal></para></listitem>
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 1f953029e..9d3fc1854 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -8,6 +8,9 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
+<!ENTITY good-perl "5.10">
+<!ENTITY bad-perl "5.14">
+
]>
<refentry>
@@ -45,7 +48,7 @@ the &sources-list; file contains references to more than one distribution
APT assigns a priority to each version that is available.
Subject to dependency constraints, <command>apt-get</command> selects the
version with the highest priority for installation.
-The APT preferences file overrides the priorities that APT assigns to
+The APT preferences override the priorities that APT assigns to
package versions by default, thus giving the user control over which
one is selected for installation.</para>
@@ -53,17 +56,17 @@ one is selected for installation.</para>
the &sources-list; file contains references to more than one source.
In this case <command>apt-get</command> downloads the instance listed
earliest in the &sources-list; file.
-The APT preferences file does not affect the choice of instance, only
+The APT preferences do not affect the choice of instance, only
the choice of version.</para>
<para>Preferences are a strong power in the hands of a system administrator
but they can become also their biggest nightmare if used without care!
-APT will not questioning the preferences so wrong settings will therefore
+APT will not question the preferences, so wrong settings can
lead to uninstallable packages or wrong decisions while upgrading packages.
-Even more problems will arise if multiply distribution releases are mixed
+Even more problems will arise if multiple distribution releases are mixed
without a good understanding of the following paragraphs.
-Packages included in a specific release aren't tested in and
-therefore doesn't always work as expected in older or newer releases or
+Packages included in a specific release aren't tested in (and
+therefore don't always work as expected in) older or newer releases, or
together with other packages from different releases.
You have been warned.</para>
@@ -72,8 +75,8 @@ directory are parsed in alphanumeric ascending order and need to obey the
following naming convention: The files have either no or "<literal>pref</literal>"
as filename extension and only contain alphanumeric, hyphen (-),
underscore (_) and period (.) characters.
-Otherwise APT will print a notice that it has ignored a file if the file
-doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
+Otherwise APT will print a notice that it has ignored a file, unless that
+file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
configuration list - in this case it will be silently ignored.</para>
<refsect2><title>APT's Default Priority Assignments</title>
@@ -106,14 +109,14 @@ algorithm to set the priorities of the versions of a package. Assign:
<term>priority 1</term>
<listitem><simpara>to the versions coming from archives which in their <filename>Release</filename>
files are marked as "NotAutomatic: yes" but <emphasis>not</emphasis> as "ButAutomaticUpgrades: yes"
-like the debian <literal>experimental</literal> archive.</simpara></listitem>
+like the Debian <literal>experimental</literal> archive.</simpara></listitem>
</varlistentry>
<varlistentry>
<term>priority 100</term>
<listitem><simpara>to the version that is already installed (if any) and to the versions coming
from archives which in their <filename>Release</filename> files are marked as "NotAutomatic: yes" and
-"ButAutomaticUpgrades: yes" like the debian backports archive since <literal>squeeze-backports</literal>.
+"ButAutomaticUpgrades: yes" like the Debian backports archive since <literal>squeeze-backports</literal>.
</simpara></listitem>
</varlistentry>
@@ -185,14 +188,14 @@ and a general form.
<itemizedlist>
<listitem>
<simpara>The specific form assigns a priority (a "Pin-Priority") to one or more
-specified packages and specified version or version range. For example,
+specified packages with a specified version or version range. For example,
the following record assigns a high priority to all versions of
-the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".
+the <filename>perl</filename> package whose version number begins with "<literal>&good-perl;</literal>".
Multiple packages can be separated by spaces.</simpara>
<programlisting>
Package: perl
-Pin: version 5.8*
+Pin: version &good-perl;*
Pin-Priority: 1001
</programlisting>
</listitem>
@@ -246,11 +249,11 @@ Pin-Priority: 900
<simpara>The following record assigns a high priority to all package versions
belonging to any release whose Archive name is "<literal>stable</literal>"
-and whose release Version number is "<literal>3.0</literal>".</simpara>
+and whose release Version number is "<literal>&stable-version;</literal>".</simpara>
<programlisting>
Package: *
-Pin: release a=stable, v=3.0
+Pin: release a=stable, v=&stable-version;
Pin-Priority: 500
</programlisting>
</listitem>
@@ -259,12 +262,12 @@ Pin-Priority: 500
</refsect2>
-<refsect2><title>Regular expressions and glob() syntax</title>
+<refsect2><title>Regular expressions and &glob; syntax</title>
<para>
-APT also supports pinning by glob() expressions and regular
-expressions surrounded by /. For example, the following
+APT also supports pinning by &glob; expressions, and regular
+expressions surrounded by slashes. For example, the following
example assigns the priority 500 to all packages from
-experimental where the name starts with gnome (as a glob()-like
+experimental where the name starts with gnome (as a &glob;-like
expression) or contains the word kde (as a POSIX extended regular
expression surrounded by slashes).
</para>
@@ -278,12 +281,12 @@ Pin-Priority: 500
<para>
The rule for those expressions is that they can occur anywhere
where a string can occur. Thus, the following pin assigns the
-priority 990 to all packages from a release starting with karmic.
+priority 990 to all packages from a release starting with &ubuntu-codename;.
</para>
<programlisting>
Package: *
-Pin: release n=karmic*
+Pin: release n=&ubuntu-codename;*
Pin-Priority: 990
</programlisting>
@@ -291,11 +294,11 @@ Pin-Priority: 990
If a regular expression occurs in a <literal>Package</literal> field,
the behavior is the same as if this regular expression were replaced
with a list of all package names it matches. It is undecided whether
-this will change in the future, thus you should always list wild-card
+this will change in the future; thus you should always list wild-card
pins first, so later specific pins override it.
The pattern "<literal>*</literal>" in a Package field is not considered
-a glob() expression in itself.
+a &glob; expression in itself.
</para>
</refsect2>
@@ -357,7 +360,7 @@ records presented earlier:</para>
<programlisting>
Package: perl
-Pin: version 5.8*
+Pin: version &good-perl;*
Pin-Priority: 1001
Package: *
@@ -373,8 +376,8 @@ Pin-Priority: 50
<itemizedlist>
<listitem><simpara>The most recent available version of the <literal>perl</literal>
package will be installed, so long as that version's version number begins
-with "<literal>5.8</literal>". If <emphasis>any</emphasis> 5.8* version of <literal>perl</literal> is
-available and the installed version is 5.9*, then <literal>perl</literal> will be
+with "<literal>&good-perl;</literal>". If <emphasis>any</emphasis> &good-perl;* version of <literal>perl</literal> is
+available and the installed version is &bad-perl;*, then <literal>perl</literal> will be
downgraded.</simpara></listitem>
<listitem><simpara>A version of any package other than <literal>perl</literal>
that is available from the local system has priority over other versions,
@@ -461,16 +464,16 @@ Pin: release n=&testing-codename;
<term>the <literal>Version:</literal> line</term>
<listitem><simpara>names the release version. For example, the
packages in the tree might belong to Debian release
-version 3.0. Note that there is normally no version number for the
+version &stable-version;. Note that there is normally no version number for the
<literal>testing</literal> and <literal>unstable</literal> distributions because they
have not been released yet. Specifying this in the APT preferences
file would require one of the following lines.
</simpara>
<programlisting>
-Pin: release v=3.0
-Pin: release a=stable, v=3.0
-Pin: release 3.0
+Pin: release v=&stable-version;
+Pin: release a=stable, v=&stable-version;
+Pin: release &stable-version;
</programlisting>
</listitem>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index f6e240aa4..1657999e6 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 15:23+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"
@@ -2256,7 +2256,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the "
+"ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -3582,9 +3582,9 @@ msgid ""
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3593,8 +3593,8 @@ msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3602,13 +3602,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3619,8 +3619,8 @@ msgid ""
"following naming convention: The files have either no or "
"\"<literal>pref</literal>\" as filename extension and only contain "
"alphanumeric, hyphen (-), underscore (_) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
@@ -3677,7 +3677,7 @@ msgstr ""
msgid ""
"to the versions coming from archives which in their "
"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
-"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
@@ -3691,7 +3691,7 @@ msgstr ""
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
@@ -3816,8 +3816,8 @@ msgstr ""
#: apt_preferences.5.xml:187
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -3925,7 +3925,7 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -3933,23 +3933,23 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a "
-"glob()-like expression) or contains the word kde (as a POSIX extended "
-"regular expression surrounded by slashes)."
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -3966,7 +3966,7 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -3974,7 +3974,7 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
@@ -3984,9 +3984,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -4242,8 +4242,8 @@ msgstr ""
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and "
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
"<literal>unstable</literal> distributions because they have not been "
"released yet. Specifying this in the APT preferences file would require one "
"of the following lines."
@@ -4253,9 +4253,9 @@ msgstr ""
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -4586,8 +4586,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 4a7cd414b..6aaa83a35 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+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"
@@ -3220,7 +3220,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -5230,15 +5230,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>). "
+#| "APT assigns a priority to each version that is available. Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation. The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"Es könnten mehrere Versionen eines Pakets zur Installation verfügbar sein, "
"wenn die Datei &sources-list; Bezüge zu mehr als einer Distribution enthält "
@@ -5252,12 +5262,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source. In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file. The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"Es könnten mehrere Instanzen der gleichen Version eines Paketes verfügbar "
"sein, wenn die Datei &sources-list; Bezüge zu mehr als einer Distribution "
@@ -5271,13 +5288,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
"Eigenschaften sind in der Hand eines Systemadministrator ein große Stärke, "
"können aber auch sein größter Albtraum werden, wenn sie unvorsichtig benutzt "
@@ -5298,7 +5315,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -5377,7 +5394,7 @@ msgstr "Priorität 1"
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</"
@@ -5395,7 +5412,7 @@ msgstr "Priorität 100"
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu "
@@ -5571,10 +5588,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range. For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -5727,42 +5751,42 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
"gehören, deren Archivname »<literal>stable</literal>« und deren Release-"
-"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
+"Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:252
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr "Reguläre Ausdrücke und glob()-Syntax"
+msgid "Regular expressions and &glob; syntax"
+msgstr "Reguläre Ausdrücke und &glob;-Syntax"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
"expression surrounded by slashes)."
msgstr ""
-"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
+"APT unterstützt außerdem Pinning mittels &glob;-Ausdrücken und regulären "
"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
-"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
+"denen der Name mit »gnome« beginnt (wie ein &glob;-artiger Ausdruck) oder "
"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
"von Schrägstrichen umschlossen wird)."
@@ -5783,7 +5807,7 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen "
@@ -5794,11 +5818,11 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5807,9 +5831,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
"Falls ein regulärer Ausdruck in einem <literal>Package</literal>-Feld "
"vorkommt, ist das Verhalten dasselbe, als wenn der reguläre Ausdruck durch "
@@ -5817,7 +5841,7 @@ msgstr ""
"nicht entschieden, wie sich dies in Zukunft ändern wird, daher sollten Sie "
"immer zuerst Platzhalter-Pins auflisten, so dass es später spezielle Pins "
"außer Kraft setzen können. Das Muster »<literal>*</literal>« in einem "
-"»Package«-Feld wird selbst nicht als ein glob()-Ausdruck angesehen."
+"»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:307
@@ -6149,29 +6173,30 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur "
-"Debian-Release-Version 3.0 gehören. Beachten Sie, dass es normalerweise "
-"keine Versionsnummer für <literal>testing</literal>- und <literal>unstable</"
-"literal>-Distributionen gibt, weil sie noch nicht veröffentlicht wurden. "
-"Diese in der APT-Einstellungsdatei anzugeben würde eine der folgenden Zeilen "
-"benötigen:"
+"Debian-Release-Version &stable-version; gehören. Beachten Sie, dass es "
+"normalerweise keine Versionsnummer für <literal>testing</literal>- und "
+"<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht "
+"veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde "
+"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:480
@@ -6635,8 +6660,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
"Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine "
diff --git a/doc/po/es.po b/doc/po/es.po
index 0e4c9d04b..57727f303 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+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"
@@ -3263,7 +3263,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -5317,15 +5317,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>). "
+#| "APT assigns a priority to each version that is available. Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation. The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"Puede disponer de varias versiones de un mismo paquete cuando el fichero "
"&sources-list; contiene referencias a más de una distribución (por ejemplo, "
@@ -5338,12 +5348,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source. In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file. The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"Puede que estén disponibles varios ejemplares de la misma versión de un "
"paquete cuando el fichero «&sources-list;» contenga referencias a más de una "
@@ -5357,13 +5374,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
"Las preferencias («preferences») son un gran poder en las manos de un "
"administrador de sistemas, ¡pero también se pueden convertir en su mayor "
@@ -5392,7 +5409,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -5468,12 +5485,12 @@ msgstr "priority 1"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
#| "experimental archive."
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
"para las versiones procedentes de archivos que en sus ficheros "
@@ -5490,12 +5507,12 @@ msgstr "prioridad 100"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
#| "experimental archive."
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
"para las versiones procedentes de archivos que en sus ficheros "
@@ -5671,10 +5688,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range. For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -5827,37 +5851,37 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"El siguiente registro asigna una prioridad alta a todas las versiones de los "
"paquetes pertenecientes a cualquier publicación que tenga como nombre de "
"archivo de paquetes «<literal>stable</literal>» y como número de versión "
-"«<literal>3.0</literal>»."
+"«<literal>&stable-version;</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:252
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
"expression surrounded by slashes)."
msgstr ""
@@ -5878,7 +5902,7 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -5886,11 +5910,11 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5899,9 +5923,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -6234,15 +6258,16 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol "
-"pueden pertenecer a la versión 3.0 de Debian. Observe que, generalmente, "
-"<literal>testing</literal> y <literal>unstable</literal> no tienen una "
-"versión asignada porque no se han publicado. Para especificar una "
+"pueden pertenecer a la versión &stable-version; de Debian. Observe que, "
+"generalmente, <literal>testing</literal> y <literal>unstable</literal> no "
+"tienen una versión asignada porque no se han publicado. Para especificar una "
"preferencia de acuerdo con este parámetro tendrá que poner una de las "
"siguientes línea en el fichero de preferencias de APT:"
@@ -6250,13 +6275,13 @@ msgstr ""
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:480
@@ -6727,8 +6752,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
"El directorio <filename>/etc/apt/sources.list.d</filename> ofrece una manera "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index e59340bab..f8a9066a1 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+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"
@@ -499,15 +499,14 @@ msgid ""
"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
msgstr ""
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
-"\"chaîne_de_configuration\">"
+"<!ENTITY synopsis-config-string \"chaîne_de_configuration\">"
#. type: Plain text
#: apt.ent:201
msgid ""
"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
"synopsis-config-file \"config_file\">"
-msgstr "synopsis-config-file \"fichier_de_configuration\">"
+msgstr "<!ENTITY synopsis-config-file \"fichier_de_configuration\">"
#. type: Plain text
#: apt.ent:204
@@ -516,43 +515,42 @@ msgid ""
"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
"\"target_release\">"
msgstr ""
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
-"\"publication_cible\">"
+"<!ENTITY synopsis-target-release \"publication_cible\">"
#. type: Plain text
#: apt.ent:207
msgid ""
"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
"synopsis-architecture \"architecture\">"
-msgstr "synopsis-architecture \"architecture\">"
+msgstr "<!ENTITY synopsis-architecture \"architecture\">"
#. type: Plain text
#: apt.ent:210
msgid ""
"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
"--> <!ENTITY synopsis-pkg \"pkg\">"
-msgstr "--> <!ENTITY synopsis-pkg \"paquet\">"
+msgstr "<!ENTITY synopsis-pkg \"paquet\">"
#. type: Plain text
#: apt.ent:213
msgid ""
"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
-msgstr "ENTITY synopsis-pkg-ver-number \"numéro_version_paquet\">"
+msgstr "<!ENTITY synopsis-pkg-ver-number \"numéro_version_paquet\">"
#. type: Plain text
#: apt.ent:216
msgid ""
"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
-msgstr "pkgnames apt --> <!ENTITY synopsis-prefix \"préfixe\">"
+msgstr "<!ENTITY synopsis-prefix \"préfixe\">"
#. type: Plain text
#: apt.ent:219
msgid ""
"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
"awesome --> <!ENTITY synopsis-regex \"regex\">"
-msgstr "awesome --> <!ENTITY synopsis-regex \"expression_régulière\">"
+msgstr "<!ENTITY synopsis-regex \"expression_régulière\">"
#. type: Plain text
#: apt.ent:222
@@ -560,7 +558,7 @@ msgid ""
"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
msgstr ""
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
+"<!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
#. type: Plain text
#: apt.ent:225
@@ -569,15 +567,14 @@ msgid ""
"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
"\"temporary_directory\">"
msgstr ""
-"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
-"\"répertoire_temporaire\">"
+"<!ENTITY synopsis-tmp-directory \"répertoire_temporaire\">"
#. type: Plain text
#: apt.ent:228
msgid ""
"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
"synopsis-filename \"filename\">"
-msgstr "synopsis-filename \"nom_de_fichier\">"
+msgstr "<!ENTITY synopsis-filename \"nom_de_fichier\">"
#. type: Plain text
#: apt.ent:231
@@ -585,7 +582,7 @@ msgid ""
"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
msgstr ""
-"packages path override-file pathprefix --> <!ENTITY synopsis-path \"chemin\">"
+"<!ENTITY synopsis-path \"chemin\">"
#. type: Plain text
#: apt.ent:234
@@ -594,8 +591,7 @@ msgid ""
"packages path override-file pathprefix --> <!ENTITY synopsis-override "
"\"override-file\">"
msgstr ""
-"packages path override-file pathprefix --> <!ENTITY synopsis-override "
-"\"fichier-override\">"
+"<!ENTITY synopsis-override \"fichier-override\">"
#. type: Plain text
#: apt.ent:237
@@ -604,22 +600,21 @@ msgid ""
"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
"\"pathprefix\">"
msgstr ""
-"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
-"\"préfixe_de_chemin\">"
+"<!ENTITY synopsis-pathprefix \"préfixe_de_chemin\">"
#. type: Plain text
#: apt.ent:240
msgid ""
"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
"generate section --> <!ENTITY synopsis-section \"section\">"
-msgstr "generate section --> <!ENTITY synopsis-section \"section\">"
+msgstr "<!ENTITY synopsis-section \"section\">"
#. type: Plain text
#: apt.ent:243
msgid ""
"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "473041FA --> <!ENTITY synopsis-keyid \"id_de_clé\">"
+msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt-get.8.xml:26 apt-cache.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26
@@ -3179,7 +3174,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -5262,15 +5257,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>). "
+#| "APT assigns a priority to each version that is available. Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation. The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"Quand le fichier &sources-list; contient des références à plusieurs "
"distributions (par exemple, <literal>stable</literal> et <literal>testing</"
@@ -5283,12 +5288,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source. In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file. The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"Si le fichier &sources-list; contient, pour une même distribution, des "
"références à plusieurs sites de téléchargement, il peut exister plusieurs "
@@ -5302,13 +5314,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
"Les préférences sont un outil puissant pour les administrateurs système mais "
"peuvent devenir leur pire cauchemar si elles sont utilisées sans "
@@ -5320,23 +5332,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:70
-#, fuzzy
-#| msgid ""
-#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
-#| "directory are parsed in alphanumeric ascending order and need to obey the "
-#| "following naming convention: The files have no or \"<literal>pref</"
-#| "literal>\" as filename extension and which only contain alphanumeric, "
-#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will "
-#| "print a notice that it has ignored a file if the file doesn't match a "
-#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-#| "configuration list - in this case it will be silently ignored."
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -5411,12 +5413,12 @@ msgstr "priorité 1"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
#| "experimental archive."
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
"pour les versions issues d'archives dont le fichier <filename>Release</"
@@ -5433,12 +5435,12 @@ msgstr "une priorité égale à 100"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
#| "experimental archive."
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
"pour les versions issues d'archives dont le fichier <filename>Release</"
@@ -5614,10 +5616,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range. For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -5768,37 +5777,37 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"L'entrée suivante affecte une priorité haute à toutes les versions d'un "
"paquet appartenant à toute distribution dont le nom d'« Archive » est "
-"<literal>stable</literal> et dont le numéro de « Version » est <literal>3.0</"
-"literal>."
+"<literal>stable</literal> et dont le numéro de « Version » est "
+"<literal>&stable-version;</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:252
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
"expression surrounded by slashes)."
msgstr ""
@@ -5819,7 +5828,7 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -5827,11 +5836,11 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5840,9 +5849,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -6171,29 +6180,30 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"indique la version de la distribution. Par exemple, les paquets dans les "
-"répertoires peuvent appartenir à la distribution Debian version 3.0. Il n'y "
-"a pas de numéro de version pour les distributions <literal>testing</literal> "
-"et <literal>unstable</literal> car elles n'ont pas encore été publiées. "
-"Indiquer cette valeur dans le fichier des préférences demanderait ces "
-"lignes :"
+"répertoires peuvent appartenir à la distribution Debian version &stable-"
+"version;. Il n'y a pas de numéro de version pour les distributions "
+"<literal>testing</literal> et <literal>unstable</literal> car elles n'ont "
+"pas encore été publiées. Indiquer cette valeur dans le fichier des "
+"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:480
@@ -6649,8 +6659,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
"Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de "
diff --git a/doc/po/it.po b/doc/po/it.po
index 4f899a0a5..753833a02 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 15:23+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"
@@ -2224,7 +2224,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -3540,9 +3540,9 @@ msgid ""
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3551,8 +3551,8 @@ msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3560,13 +3560,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3577,7 +3577,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -3632,7 +3632,7 @@ msgstr ""
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
@@ -3646,7 +3646,7 @@ msgstr ""
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
@@ -3770,8 +3770,8 @@ msgstr ""
#: apt_preferences.5.xml:187
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -3879,7 +3879,7 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -3887,23 +3887,23 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -3940,7 +3940,7 @@ msgid ""
"of all package names it matches. It is undecided whether this will change in "
"the future, thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -4196,19 +4196,20 @@ msgstr ""
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -4537,8 +4538,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 49c2e5234..fb496ff89 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+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"
@@ -3319,7 +3319,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -5126,15 +5126,25 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>). "
+#| "APT assigns a priority to each version that is available. Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation. The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"&sources-list; ファイルに複数のディストリビューション (<literal>stable</"
"literal> と <literal>testing</literal> など) が指定されていて、パッケージに対"
@@ -5148,12 +5158,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source. In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file. The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"&sources-list; ファイルに複数の参照が書かれている場合、パッケージの同じバー"
"ジョンのインスタンスが複数利用できる可能性があります。この場合、<command>apt-"
@@ -5166,13 +5183,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -5191,7 +5208,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -5277,7 +5294,7 @@ msgstr "priority 1"
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
@@ -5292,7 +5309,7 @@ msgstr "priority 100"
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
@@ -5465,10 +5482,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range. For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -5627,11 +5651,11 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"以下のレコードは、アーカイブ名が \"<literal>stable</literal>\" で、リリース"
-"バージョン番号が \"<literal>3.0</literal>\" となっているリリースに属するパッ"
-"ケージを、すべて高い優先度に割り当てます。"
+"バージョン番号が \"<literal>&stable-version;</literal>\" となっているリリース"
+"に属するパッケージを、すべて高い優先度に割り当てます。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -5639,26 +5663,26 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
"\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
"expression surrounded by slashes)."
msgstr ""
@@ -5680,7 +5704,7 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -5689,11 +5713,11 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5702,9 +5726,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
@@ -6073,29 +6097,30 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"リリースバージョン名です。例えば、このツリーのパッケージが、GNU/Linux リリー"
-"スバージョン 3.0 に属するとします。通常 <literal>testing</literal> ディストリ"
-"ビューションや <literal>unstable</literal> ディストリビューションには、まだリ"
-"リースされていないので、バージョン番号が付きません。APT 選択ファイルでこれを"
-"指定するには、以下の行のいずれかが必要になります。"
+"スバージョン &stable-version; に属するとします。通常 <literal>testing</"
+"literal> ディストリビューションや <literal>unstable</literal> ディストリ"
+"ビューションには、まだリリースされていないので、バージョン番号が付きません。"
+"APT 選択ファイルでこれを指定するには、以下の行のいずれかが必要になります。"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -6587,8 +6612,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
"<filename>/etc/apt/sources.list.d</filename> ディレクトリは、個別ファイルで追"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 91bc0dd1f..828312718 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+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"
@@ -3324,7 +3324,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -4666,15 +4666,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>). "
+#| "APT assigns a priority to each version that is available. Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation. The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"Jeżeli plik &sources-list; zawiera odniesienia do więcej niż jednej "
"dystrybucji (na przykład <literal>stable</literal> i <literal>testing</"
@@ -4688,12 +4698,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source. In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file. The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"Może być dostępnych kilka instancji tej samej wersji pakietu, jeśli plik "
"&sources-list; zawiera odwołania do więcej niż jednego źródła. W takim "
@@ -4706,13 +4723,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
"Preferencje są mocnym narzędziem w rękach administratora systemu, ale mogą "
"stać się też jego największym koszmarem, jeśli zostaną nieostrożnie użyte! "
@@ -4734,7 +4751,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -4813,7 +4830,7 @@ msgstr "priorytet 1"
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
"wersjom pochodzącym z archiwów, których pliki <filename>Release</filename> "
@@ -4831,7 +4848,7 @@ msgstr "priorytet 100"
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
"wersji, która jest już zainstalowana (o ile jakaś jest) i wersjom "
@@ -4997,10 +5014,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range. For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -5151,44 +5175,44 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"Następujący rekord przypisuje wysoki priorytet wszystkim wersjom pakietów "
"należącym do jakiegokolwiek wydania, którego pole <literal>Archive</literal> "
"(zawierające nazwę archiwum) jest równe \"<literal>stable</literal>\", a "
"pole <literal>Version</literal> (numer wersji wydania) wynosi "
-"\"<literal>3.0</literal>\"."
+"\"<literal>&stable-version;</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:252
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr "Składnia wyrażeń regularnych i glob()"
+msgid "Regular expressions and &glob; syntax"
+msgstr "Składnia wyrażeń regularnych i &glob;"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
"expression surrounded by slashes)."
msgstr ""
-"APT także wspiera dopasowywanie przy użyciu wzorców glob() i wyrażeń "
+"APT także wspiera dopasowywanie przy użyciu wzorców &glob; i wyrażeń "
"regularnych otoczonych znakami /. Następujący przykład ustawia priorytet 500 "
"wszystkim pakietom z dystrybucji <literal>experimental</literal>, których "
-"nazwa zaczyna się od <literal>gnome</literal> (jako wzorzec glob()) lub "
+"nazwa zaczyna się od <literal>gnome</literal> (jako wzorzec &glob;) lub "
"zawiera słowo <literal>kde</literal> (jako rozszerzone wyrażenie regularne "
"POSIX otoczone ukośnikami)."
@@ -5209,22 +5233,22 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
"Wyrażenia te mogą wystąpić wszędzie, gdzie tylko może wystąpić łańcuch "
"znaków. Dlatego następujący przykład przypisuje priorytet 990 wszystkim "
-"pakietom z wydania o nazwie zaczynającej się od <literal>karmic</literal>."
+"pakietom z wydania o nazwie zaczynającej się od &ubuntu-codename;."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:285
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5233,9 +5257,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
"Jeśli wyrażenie regularne występuje w polu <literal>Package</literal>, to "
"zachowanie jest takie samo, jakby to wyrażenie regularne zostało zastąpione "
@@ -5244,7 +5268,7 @@ msgstr ""
"dlatego powinno się zawsze umieszczać preferencje zawierające wzorce "
"pakietów na początku, tak żeby mogły zostać nadpisane przez preferencje "
"dotyczące specyficznych pakietów. Wzorzec \"<literal>*</literal>\" w polu "
-"<literal>Package</literal> nie jest uznawany za wyrażenie glob()."
+"<literal>Package</literal> nie jest uznawany za wyrażenie &glob;."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:307
@@ -5576,28 +5600,30 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"określa wersję wydania. Na przykład pakiety w drzewie katalogów mogłyby "
-"należeć do wersji 3.0 dystrybucji Debiana. Proszę zauważyć, że zazwyczaj "
-"dystrybucje <literal>testing</literal> i <literal>unstable</literal> nie "
-"mają przypisanego numeru wersji, ponieważ nie są one oficjalnie wydawane. "
-"Wersję wydania można podać w pliku preferencji APT w następujący sposób:"
+"należeć do wersji &stable-version; dystrybucji Debiana. Proszę zauważyć, że "
+"zazwyczaj dystrybucje <literal>testing</literal> i <literal>unstable</"
+"literal> nie mają przypisanego numeru wersji, ponieważ nie są one oficjalnie "
+"wydawane. Wersję wydania można podać w pliku preferencji APT w następujący "
+"sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:480
@@ -6056,8 +6082,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 52f372267..9dfa5de98 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+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"
@@ -3225,7 +3225,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -5255,15 +5255,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>). "
+#| "APT assigns a priority to each version that is available. Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation. The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"Várias versões de um pacote podem estar disponíveis para instalação quando o "
"ficheiro &sources-list; contém referências a mais do que uma distribuição "
@@ -5277,12 +5287,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source. In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file. The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"Podem estar disponíveis várias instâncias da mesma versão de um pacote "
"quando o ficheiro &sources-list; contém referências a mais do que uma fonte. "
@@ -5295,13 +5312,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
"As preferências são um poder forte nas mãos de um administrador de sistemas "
"mas também se podem tornar no seu maior pesadelo se forem usadas sem "
@@ -5330,7 +5347,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -5411,17 +5428,17 @@ msgstr "priority 1"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
#| "experimental archive."
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
-"experimental da debian."
+"experimental da Debian."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:113
@@ -5433,17 +5450,17 @@ msgstr "priority 100"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
#| "experimental archive."
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
-"experimental da debian."
+"experimental da Debian."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:121
@@ -5612,10 +5629,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range. For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -5768,37 +5792,37 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"O seguinte registo atribui alta prioridade a todas as versões de pacotes "
"pertencentes a qualquer lançamento cujo nome de Arquivo é \"<literal>stable</"
-"literal>\" e cujo número de Versão de lançamento é \"<literal>3.0</literal>"
-"\"."
+"literal>\" e cujo número de Versão de lançamento é \"<literal>&stable-"
+"version;</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:252
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
"expression surrounded by slashes)."
msgstr ""
@@ -5819,7 +5843,7 @@ msgstr ""
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -5827,11 +5851,11 @@ msgstr ""
#, no-wrap
msgid ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
msgstr ""
"Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5840,9 +5864,9 @@ msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
"of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -6201,29 +6225,30 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem "
-"pertencer ao lançamento de Debian versão 3.0. Note que não há normalmente um "
-"número de versão para as distribuições <literal>testing</literal> e "
-"<literal>unstable</literal>. porque ainda não foram lançadas. Especificar "
-"isto no ficheiro de preferências do APT irá requerer uma das seguintes "
-"linhas:"
+"pertencer ao lançamento de Debian versão &stable-version;. Note que não há "
+"normalmente um número de versão para as distribuições <literal>testing</"
+"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. "
+"Especificar isto no ficheiro de preferências do APT irá requerer uma das "
+"seguintes linhas:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:480
@@ -6690,8 +6715,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
"O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 4716dcdb6..d2419c84d 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-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 15:23+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"
@@ -2263,7 +2263,7 @@ msgid ""
"order which have either no or \"<literal>conf</literal>\" as filename "
"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
"and period (.) characters. Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
"Ignore-Files-Silently</literal> configuration list - in this case it will be "
"silently ignored."
msgstr ""
@@ -3586,9 +3586,9 @@ msgid ""
"example, <literal>stable</literal> and <literal>testing</literal>). APT "
"assigns a priority to each version that is available. Subject to dependency "
"constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation. The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation. The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
msgstr ""
"Diversas versões de um pacote podem estar disponíveis para instalação quando "
"o arquivo &sources-list; contém referências para mais de uma distribuição "
@@ -3607,8 +3607,8 @@ msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
"case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file. The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file. The APT preferences do not affect the choice of "
+"instance, only the choice of version."
msgstr ""
"Diversas instâncias da mesma versão de um pacote pode estar disponíveis "
"quando o arquivo &sources-list; contém referências a mais de uma fonte. "
@@ -3621,13 +3621,13 @@ msgstr ""
msgid ""
"Preferences are a strong power in the hands of a system administrator but "
"they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages. Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases. You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages. Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs. Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -3638,7 +3638,7 @@ msgid ""
"following naming convention: The files have either no or \"<literal>pref</"
"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -3712,7 +3712,7 @@ msgstr "prioridade 100"
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
"<literal>experimental</literal> archive."
msgstr ""
@@ -3727,7 +3727,7 @@ msgstr "prioridade 100"
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
@@ -3907,8 +3907,8 @@ msgstr ""
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range. For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range. For example, "
+"the following record assigns a high priority to all versions of the "
"<filename>perl</filename> package whose version number begins with "
"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces."
msgstr ""
@@ -4068,7 +4068,7 @@ msgstr ""
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
msgstr ""
"O registro a seguir atribui uma prioridade alta para todas as versões de "
"pacotes que pertençam a qualquer versão cujo nome do Repositório seja "
@@ -4080,7 +4080,7 @@ msgstr ""
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
msgstr ""
"<programlisting>\n"
@@ -4090,17 +4090,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:264
msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -4145,7 +4145,7 @@ msgid ""
"of all package names it matches. It is undecided whether this will change in "
"the future, thus you should always list wild-card pins first, so later "
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -4516,10 +4516,11 @@ msgstr ""
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian release version 3.0. Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet. Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;. Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet. Specifying this in the APT preferences file would require one "
+"of the following lines."
msgstr ""
"dá nome a versão da distribuição. Por exemplo, os pacote na àrvore podem "
"pertencer a distribuição Debian versão 3.0. Note que normalmente não existe "
@@ -4532,9 +4533,9 @@ msgstr ""
#: apt_preferences.5.xml:471
#, fuzzy, no-wrap
msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
msgstr ""
"<programlisting>\n"
"Pin: release v=3.0\n"
@@ -4998,8 +4999,8 @@ msgid ""
"the regular <filename>sources.list</filename> file. File names need to end "
"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
"configuration list - in this case it will be silently ignored."
msgstr ""
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index d132b399c..931e96b79 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -57,8 +57,8 @@
File names need to end with
<filename>.list</filename> and may only contain letters (a-z and A-Z),
digits (0-9), underscore (_), hyphen (-) and period (.) characters.
- Otherwise APT will print a notice that it has ignored a file if the file
- doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
+ Otherwise APT will print a notice that it has ignored a file, unless that
+ file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
configuration list - in this case it will be silently ignored.</para>
</refsect1>