From 671b7116373153c6498bffafc7d0312b67ffb069 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 27 Mar 2012 15:14:38 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - do not crash if (*I).Pkg is NULL (LP: #939867) --- apt-pkg/deb/dpkgpm.cc | 5 ++++- debian/changelog | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c46a81209..be11870fd 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1595,7 +1595,10 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) const char *ops_str[] = {"Install", "Configure","Remove","Purge"}; fprintf(report, "AptOrdering:\n"); for (vector::iterator I = List.begin(); I != List.end(); ++I) - fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]); + if ((*I).Pkg != NULL) + fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]); + else + fprintf(report, " %s: %s\n", "NULL", ops_str[(*I).Op]); // attach dmesg log (to learn about segfaults) if (FileExists("/bin/dmesg")) diff --git a/debian/changelog b/debian/changelog index 2003da5c3..48b63784e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,12 @@ apt (0.8.16~exp14) UNRELEASED; urgency=low - recheck all dependencies if we changed a package in SmartConfigure as this could break an earlier dependency (LP: #940396) - recheck dependencies in SmartUnpack after a change, too - + + [ Thorsten Spindler ] + * apt-pkg/deb/dpkgpm.cc: + - do not crash if (*I).Pkg is NULL (LP: #939867) + + -- David Kalnischkies Tue, 13 Mar 2012 12:38:35 +0100 apt (0.8.16~exp13) experimental; urgency=low -- cgit v1.2.3 From 2629740920b3345df5e2e0cac178c447024877e8 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 27 Mar 2012 20:32:10 +0200 Subject: Fix typo in apt-get(8). Closes: #664833 --- debian/changelog | 6 ++++++ doc/apt-get.8.xml | 2 +- doc/po/apt-doc.pot | 2 +- doc/po/de.po | 2 +- doc/po/es.po | 2 +- doc/po/fr.po | 2 +- doc/po/it.po | 2 +- doc/po/ja.po | 2 +- doc/po/pl.po | 2 +- doc/po/pt.po | 2 +- doc/po/pt_BR.po | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97b9a182d..6561a556a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.8.15.11) UNRELEASED; urgency=low + + * Fix typo in apt-get(8). Closes: #664833 + + -- Christian Perrier Tue, 27 Mar 2012 20:31:38 +0200 + apt (0.8.15.10) unstable; urgency=high [ David Kalnischkies ] diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 0b52574e6..b1e4bf975 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -247,7 +247,7 @@ source causes apt-get to fetch source packages. APT will examine the available packages to decide which source package to fetch. It will then find and download into the current directory the - newest available version of that source package while respect the + newest available version of that source package while respecting the default release, set with the option APT::Default-Release, the option or per package with the pkg/release syntax, if possible. diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 630aec3b0..6fb883f72 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -2849,7 +2849,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option " "APT::Default-Release, the option or " "per package with the pkg/release syntax, if possible." diff --git a/doc/po/de.po b/doc/po/de.po index 96d7f054a..ad4f756f3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -3719,7 +3719,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/es.po b/doc/po/es.po index 0849736fa..f0f5b852a 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -3804,7 +3804,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/fr.po b/doc/po/fr.po index 4996a8d18..9d012d4cd 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -3736,7 +3736,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/it.po b/doc/po/it.po index 148244138..24fdc8099 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -2823,7 +2823,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/ja.po b/doc/po/ja.po index b79809055..cd170cca3 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -3892,7 +3892,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/pl.po b/doc/po/pl.po index 309fe2637..af47d1e2d 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -3724,7 +3724,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/pt.po b/doc/po/pt.po index a96a2c97a..14f632a3b 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -3739,7 +3739,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 93f189c9c..b14e5dcb4 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -2880,7 +2880,7 @@ msgid "" "source causes apt-get to fetch source " "packages. APT will examine the available packages to decide which source " "package to fetch. It will then find and download into the current directory " -"the newest available version of that source package while respect the " +"the newest available version of that source package while respecting the " "default release, set with the option APT::Default-Release, the option or per package with the " "pkg/release syntax, if possible." -- cgit v1.2.3 From 00530c3bbd5c77674dd12316240b24b0bfdc83ef Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 3 Apr 2012 21:39:06 +0200 Subject: =?UTF-8?q?Replace=20"argument"=20by=20"param=C3=A8tre"=20in=20Fre?= =?UTF-8?q?nch=20translation.=20Merci,=20les=20Titeps!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 ++ po/fr.po | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6561a556a..cc3cd330f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apt (0.8.15.11) UNRELEASED; urgency=low * Fix typo in apt-get(8). Closes: #664833 + * Replace "argument" by "paramètre" in French translation. + Merci, les Titeps! -- Christian Perrier Tue, 27 Mar 2012 20:31:38 +0200 diff --git a/po/fr.po b/po/fr.po index 1c008ef06..4db485879 100644 --- a/po/fr.po +++ b/po/fr.po @@ -258,7 +258,7 @@ msgstr "" #: cmdline/apt-config.cc:44 msgid "Arguments not in pairs" -msgstr "Les arguments ne sont pas en parité" +msgstr "Les paramètres ne sont pas appariés" #: cmdline/apt-config.cc:79 msgid "" @@ -1073,7 +1073,7 @@ msgstr "La version « %s » indisponible du paquet « %s » est ignorée" #: cmdline/apt-get.cc:1591 msgid "The update command takes no arguments" -msgstr "La commande de mise à jour ne prend pas d'argument" +msgstr "La commande de mise à jour ne prend pas de paramètre" #: cmdline/apt-get.cc:1653 msgid "We are not supposed to delete stuff, can't start AutoRemover" @@ -2502,7 +2502,7 @@ msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne" #: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 #, c-format msgid "Option %s requires an argument." -msgstr "L'option %s nécessite un argument." +msgstr "L'option %s nécessite un paramètre." #: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 #, c-format @@ -2512,7 +2512,7 @@ msgstr "Option %s : l'item configuration doit être spécifiée avec un =. #: apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "L'option %s prend un nombre entier en argument, et non « %s »" +msgstr "L'option %s prend un nombre entier en paramètre, et non « %s »" #: apt-pkg/contrib/cmndline.cc:267 #, c-format -- cgit v1.2.3 From 96273866174c54bdb25813633891f29668d43848 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 6 Apr 2012 20:09:13 +0200 Subject: Drop hardcoded "en.html" suffix in apt-secure manpage. Thanks to David Prevot. --- debian/changelog | 2 ++ doc/apt-secure.8.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cc3cd330f..870578068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.8.15.11) UNRELEASED; urgency=low * Fix typo in apt-get(8). Closes: #664833 * Replace "argument" by "paramètre" in French translation. Merci, les Titeps! + * Drop hardcoded "en.html" suffix in apt-secure manpage. + Thanks to David Prevot. -- Christian Perrier Tue, 27 Mar 2012 20:31:38 +0200 diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index f8ff678b9..53ee168f5 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -190,7 +190,7 @@ For more background information you might want to review the Debian +url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7">Debian Security Infrastructure chapter of the Securing Debian Manual (available also in the harden-doc package) and the Date: Mon, 16 Apr 2012 23:55:21 +0200 Subject: * cmdline/apt-get.cc: - if pkgCacheFile::Generate is disabled in 'update' don't remove the caches (and don't try to open them) --- cmdline/apt-get.cc | 11 +++++++---- debian/changelog | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4e6cc32de..dd9313bff 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1679,10 +1679,13 @@ bool DoUpdate(CommandLine &CmdL) ListUpdate(Stat, *List); // Rebuild the cache. - pkgCacheFile::RemoveCaches(); - if (Cache.BuildCaches() == false) - return false; - + if (_config->FindB("pkgCacheFile::Generate", true) == true) + { + pkgCacheFile::RemoveCaches(); + if (Cache.BuildCaches() == false) + return false; + } + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 7cfa37e52..8e3e35064 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.1) unstable; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - if pkgCacheFile::Generate is disabled in 'update' don't + remove the caches (and don't try to open them) + + -- David Kalnischkies Mon, 16 Apr 2012 22:56:31 +0200 + apt (0.9.0) unstable; urgency=low * upload to debian/unstable -- cgit v1.2.3 From 5ab7b53b09c508eb551eaf698bd2035cd3bc8777 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 16 Apr 2012 23:55:39 +0200 Subject: =?UTF-8?q?*=20apt-pkg/packagemanager.cc:=20=20=20-=20init=20count?= =?UTF-8?q?er=20in=20SmartConfigure=20so=20that=20the=20loop-breaker=20isn?= =?UTF-8?q?'t=20=20=20=20=20triggered=20at=20random=E2=80=A6=20(Closes:=20?= =?UTF-8?q?#669060)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/packagemanager.cc | 2 +- debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index c62c4d187..093999bc2 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -602,7 +602,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c or by the ConfigureAll call at the end of the for loop in OrderInstall. */ bool Changed = false; const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500); - unsigned int i; + unsigned int i = 0; do { Changed = false; diff --git a/debian/changelog b/debian/changelog index 8e3e35064..10f515a70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ apt (0.9.1) unstable; urgency=low * cmdline/apt-get.cc: - if pkgCacheFile::Generate is disabled in 'update' don't remove the caches (and don't try to open them) + * apt-pkg/packagemanager.cc: + - init counter in SmartConfigure so that the loop-breaker isn't + triggered at random… (Closes: #669060) - -- David Kalnischkies Mon, 16 Apr 2012 22:56:31 +0200 + -- David Kalnischkies Mon, 16 Apr 2012 23:15:22 +0200 apt (0.9.0) unstable; urgency=low -- cgit v1.2.3 From 49206fadc4b35672b3f24cbd8c1416d49a35763d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 17 Apr 2012 09:55:54 +0200 Subject: doc/* i18n refresh --- doc/po/apt-doc.pot | 4 ++-- doc/po/de.po | 20 ++++++++++++++------ doc/po/es.po | 20 ++++++++++++++------ doc/po/fr.po | 20 ++++++++++++++------ doc/po/it.po | 12 ++++++------ doc/po/ja.po | 20 ++++++++++++++------ doc/po/pl.po | 12 ++++++------ doc/po/pt.po | 20 ++++++++++++++------ doc/po/pt_BR.po | 12 ++++++------ 9 files changed, 90 insertions(+), 50 deletions(-) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 305b20085..82b120125 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-04-16 15:53+0300\n" +"POT-Creation-Date: 2012-04-17 09:49+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4077,7 +4077,7 @@ msgstr "" #: apt-secure.8.xml:191 msgid "" "For more background information you might want to review the Debian " +"url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " "Security Infrastructure chapter of the Securing Debian Manual " "(available also in the harden-doc package) and the Strong " diff --git a/doc/po/de.po b/doc/po/de.po index 3278a1f56..5d65eea0c 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.8.15-9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+0300\n" "PO-Revision-Date: 2011-11-13 11:21+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -5335,13 +5335,21 @@ msgstr "" #. type: Content of: #: apt-secure.8.xml:191 +#, fuzzy +#| msgid "" +#| "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " +#| "Manual (available also in the harden-doc package) and the Strong " +#| "Distribution HOWTO by V. Alex Brennen." msgid "" "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the Strong " -"Distribution HOWTO by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the Strong Distribution HOWTO by V. Alex Brennen." msgstr "" "Um weitere Hintergrundinformationen zu erhalten, können Sie die Die " diff --git a/doc/po/es.po b/doc/po/es.po index ad840a57b..5e554b70d 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+0300\n" "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -5345,13 +5345,21 @@ msgstr "" #. type: Content of: #: apt-secure.8.xml:191 +#, fuzzy +#| msgid "" +#| "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " +#| "Manual (available also in the harden-doc package) and the Strong " +#| "Distribution HOWTO by V. Alex Brennen." msgid "" "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the Strong " -"Distribution HOWTO by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the Strong Distribution HOWTO by V. Alex Brennen." msgstr "" "Para más información puede que quiera revisar el capítulo de la \n" "Language-Team: French \n" @@ -5297,13 +5297,21 @@ msgstr "" #. type: Content of: #: apt-secure.8.xml:191 +#, fuzzy +#| msgid "" +#| "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " +#| "Manual (available also in the harden-doc package) and the Strong " +#| "Distribution HOWTO by V. Alex Brennen." msgid "" "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the Strong " -"Distribution HOWTO by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the Strong Distribution HOWTO by V. Alex Brennen." msgstr "" "Pour des informations plus complètes, vous pouvez consulter " diff --git a/doc/po/it.po b/doc/po/it.po index 9f6f2c5c1..1e2342f7b 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+0300\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni \n" "Language-Team: \n" @@ -4057,11 +4057,11 @@ msgstr "" #: apt-secure.8.xml:191 msgid "" "For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the Strong " -"Distribution HOWTO by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the Strong Distribution HOWTO by V. Alex Brennen." msgstr "" #. type: Content of: diff --git a/doc/po/ja.po b/doc/po/ja.po index 66053e454..6c896981d 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+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" @@ -5476,13 +5476,21 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:191 +#, fuzzy +#| msgid "" +#| "For more background information you might want to review the <ulink url=" +#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " +#| "Manual (available also in the harden-doc package) and the <ulink url=" +#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " +#| "Distribution HOWTO</ulink> by V. Alex Brennen." msgid "" "For more background information you might want to review the <ulink url=" -"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" -"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the <ulink url=" -"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " -"Distribution HOWTO</ulink> by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure</ulink> chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the <ulink url=\"http://www." +"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</" +"ulink> by V. Alex Brennen." msgstr "" "詳細な背景情報を検証するのなら、Securing Debian Manual (harden-doc パッケージ" "にも収録) の <ulink url=\"http://www.debian.org/doc/manuals/securing-debian-" diff --git a/doc/po/pl.po b/doc/po/pl.po index c098c74a8..c8140963b 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+0300\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -5178,11 +5178,11 @@ msgstr "" #: apt-secure.8.xml:191 msgid "" "For more background information you might want to review the <ulink url=" -"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" -"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the <ulink url=" -"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " -"Distribution HOWTO</ulink> by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure</ulink> chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the <ulink url=\"http://www." +"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</" +"ulink> by V. Alex Brennen." msgstr "" #. type: Content of: <refentry><refsect1><title> diff --git a/doc/po/pt.po b/doc/po/pt.po index 3f7d62098..7759b2503 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+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" @@ -5268,13 +5268,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:191 +#, fuzzy +#| msgid "" +#| "For more background information you might want to review the <ulink url=" +#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " +#| "Manual (available also in the harden-doc package) and the <ulink url=" +#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " +#| "Distribution HOWTO</ulink> by V. Alex Brennen." msgid "" "For more background information you might want to review the <ulink url=" -"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" -"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the <ulink url=" -"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " -"Distribution HOWTO</ulink> by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure</ulink> chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the <ulink url=\"http://www." +"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</" +"ulink> by V. Alex Brennen." msgstr "" "Para mais informação de fundo você deve querer reler a <ulink url=\"http://" "www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index ab6cae376..97aa49c33 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2012-04-11 17:54+0300\n" +"POT-Creation-Date: 2012-04-17 09:28+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" @@ -4115,11 +4115,11 @@ msgstr "" #: apt-secure.8.xml:191 msgid "" "For more background information you might want to review the <ulink url=" -"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" -"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " -"Manual (available also in the harden-doc package) and the <ulink url=" -"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " -"Distribution HOWTO</ulink> by V. Alex Brennen." +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " +"Security Infrastructure</ulink> chapter of the Securing Debian Manual " +"(available also in the harden-doc package) and the <ulink url=\"http://www." +"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</" +"ulink> by V. Alex Brennen." msgstr "" #. type: Content of: <refentry><refsect1><title> -- cgit v1.2.3 From 66d404e36661301bd7482c75351111d5bea2905b Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Tue, 17 Apr 2012 09:56:44 +0200 Subject: releasing version 0.9.1 --- configure.in | 2 +- debian/changelog | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index ecc0cecce..b75953339 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.0" +PACKAGE_VERSION="0.9.1" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 10f515a70..8eca51cc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,14 @@ apt (0.9.1) unstable; urgency=low - init counter in SmartConfigure so that the loop-breaker isn't triggered at random… (Closes: #669060) - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 16 Apr 2012 23:15:22 +0200 + [ Christian Perrier ] + * Fix typo in apt-get(8). Closes: #664833 + * Replace "argument" by "paramètre" in French translation. + Merci, les Titeps! + * Drop hardcoded "en.html" suffix in apt-secure manpage. + Thanks to David Prevot. + + -- Michael Vogt <mvo@debian.org> Tue, 17 Apr 2012 09:49:31 +0200 apt (0.9.0) unstable; urgency=low -- cgit v1.2.3 From c204d1482e085f5453c0d99ee5a9a8e99ca90e38 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 17 Apr 2012 23:45:52 +0200 Subject: ensure that not --assert-multi-arch supporting dpkg's do not generate output in the testcases by redirecting to /dev/null --- test/integration/framework | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 0670d6a78..b80b02922 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -151,7 +151,7 @@ setupenvironment() { echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf - if ! $(which dpkg) --assert-multi-arch; then + if ! $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it… fi echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf @@ -199,7 +199,7 @@ configdpkg() { echo -n > rootdir/var/lib/dpkg/status fi fi - if $(which dpkg) --assert-multi-arch; then + if $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then local ARCHS="$(getarchitectures)" if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then DPKGARCH="$(dpkg --print-architecture)" -- cgit v1.2.3 From bce0e0ff327341da3ad54d7ea2bb6d82b3f96879 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 17 Apr 2012 23:47:35 +0200 Subject: newer gcc versions seems to have no problem with that, but while working with g++-4.1 it complains about this so lets be extra clear --- apt-pkg/cacheset.h | 4 ++-- methods/http.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 6f0a0e358..5b9900603 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -186,7 +186,7 @@ public: /*{{{*/ pkgCache::PkgIterator getPkg(void) const { return *_iter; } inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; operator typename Container::iterator(void) const { return _iter; } - operator typename PackageContainer<Container>::const_iterator() { return PackageContainer<Container>::const_iterator(_iter); } + operator typename PackageContainer<Container>::const_iterator() { return typename PackageContainer<Container>::const_iterator(_iter); } inline iterator& operator++() { ++_iter; return *this; } inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; } inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; @@ -506,7 +506,7 @@ public: /*{{{*/ pkgCache::VerIterator getVer(void) const { return *_iter; } inline pkgCache::VerIterator operator*(void) const { return *_iter; }; operator typename Container::iterator(void) const { return _iter; } - operator typename VersionContainer<Container>::const_iterator() { return VersionContainer<Container>::const_iterator(_iter); } + operator typename VersionContainer<Container>::const_iterator() { return typename VersionContainer<Container>::const_iterator(_iter); } inline iterator& operator++() { ++_iter; return *this; } inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; } inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; diff --git a/methods/http.cc b/methods/http.cc index c62ca71d3..b450b6ffc 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -602,7 +602,7 @@ bool ServerState::HeaderLine(string Line) return true; Size = strtoull(Val.c_str(), NULL, 10); - if (Size == ULLONG_MAX) + if (Size >= std::numeric_limits<unsigned long long>::max()) return _error->Errno("HeaderLine", _("The HTTP server sent an invalid Content-Length header")); return true; } -- cgit v1.2.3 From a552f37ebad5718bba7767e606f3cca13690fbd8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 18 Apr 2012 18:13:30 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - only treat the native apt as essential by default --- apt-pkg/deb/deblistparser.cc | 10 ++++++++-- debian/changelog | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 84e6c38c5..00e2bd900 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -249,8 +249,14 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg, return false; if (strcmp(Pkg.Name(),"apt") == 0) - Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important; - + { + if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) || + essential == "all") + Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important; + else + Pkg->Flags |= pkgCache::Flag::Important; + } + if (ParseStatus(Pkg,Ver) == false) return false; return true; diff --git a/debian/changelog b/debian/changelog index 8eca51cc4..58da9d8de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.1+nmu1) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - only treat the native apt as essential by default + + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 18 Apr 2012 18:12:07 +0200 + apt (0.9.1) unstable; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 04d24dbdcc2eabf616b26878084d3b8790e30086 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 19 Apr 2012 10:29:02 +0200 Subject: ignore the order used for the 'apt' package as long as it is valid either way --- ...-ubuntu-bug-835625-multiarch-lockstep-installed-first | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first index a9a4069cf..269038d0f 100755 --- a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first +++ b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first @@ -14,7 +14,7 @@ insertpackage 'unstable' 'apt' 'i386' '2' 'Depends: libsame (= 2)' setupaptarchive -testequal 'Reading package lists... +testequalor2 'Reading package lists... Building dependency tree... The following extra packages will be installed: apt:i386 libsame:i386 @@ -28,4 +28,18 @@ Inst libsame (2 unstable [amd64]) [apt:i386 ] Conf libsame:i386 (2 unstable [i386]) [apt:i386 ] Conf libsame (2 unstable [amd64]) [apt:i386 ] Inst apt:i386 [1] (2 unstable [i386]) +Conf apt:i386 (2 unstable [i386])' 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + apt:i386 libsame:i386 +The following NEW packages will be installed: + libsame +The following packages will be upgraded: + apt:i386 libsame:i386 +2 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst apt:i386 [1] (2 unstable [i386]) [] +Inst libsame:i386 [1] (2 unstable [i386]) +Inst libsame (2 unstable [amd64]) +Conf libsame:i386 (2 unstable [i386]) +Conf libsame (2 unstable [amd64]) Conf apt:i386 (2 unstable [i386])' aptget install libsame:amd64 -s -- cgit v1.2.3 From 2448a064f33c66d4f698375d30b87201a5a3b103 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 19 Apr 2012 10:54:44 +0200 Subject: * apt-inst/contrib/extracttar.cc: - ensure that in StartGzip the InFd is set to "AutoClose" to ensure that the pipe is closed when InFd is closed. This fixes a Fd leak (LP: #985452) --- apt-inst/contrib/extracttar.cc | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 12919a7cd..806ba796d 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -146,7 +146,7 @@ bool ExtractTar::StartGzip() } // Fix up our FDs - InFd.Fd(Pipes[0]); + InFd.OpenDescriptor(Pipes[0], FileFd::ReadOnly, FileFd::None, true); close(Pipes[1]); return true; } diff --git a/debian/changelog b/debian/changelog index 48b63784e..50d6ea3ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.8.16~exp15) unstable; urgency=low + + * apt-inst/contrib/extracttar.cc: + - ensure that in StartGzip the InFd is set to "AutoClose" to ensure + that the pipe is closed when InFd is closed. This fixes a Fd leak + (LP: #985452) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Apr 2012 10:53:30 +0200 + apt (0.8.16~exp14) UNRELEASED; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 0b4895d3d223c97c6ba1ece9f7b88479debb7fb7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 19 Apr 2012 11:05:41 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - redirect stderr from compressors to /dev/null --- apt-pkg/contrib/fileutl.cc | 6 ++++++ debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 9e3611b26..e9d1ba1ce 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1098,6 +1098,12 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C dup2(d->compressed_fd,STDIN_FILENO); dup2(Pipe[1],STDOUT_FILENO); } + int const nullfd = open("/dev/null", O_WRONLY); + if (nullfd != -1) + { + dup2(nullfd,STDERR_FILENO); + close(nullfd); + } SetCloseExec(STDOUT_FILENO,false); SetCloseExec(STDIN_FILENO,false); diff --git a/debian/changelog b/debian/changelog index 58da9d8de..93dde4b91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ apt (0.9.1+nmu1) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/deb/deblistparser.cc: - only treat the native apt as essential by default + * apt-pkg/contrib/fileutl.cc: + - redirect stderr from compressors to /dev/null - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 18 Apr 2012 18:12:07 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Apr 2012 11:04:37 +0200 apt (0.9.1) unstable; urgency=low -- cgit v1.2.3 From 8eebbd5b3599c4fe0a6aa62589e3562725e1542a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 19 Apr 2012 15:53:27 +0200 Subject: update the changelog with a Closes tag for the newly reported all apt essential issue --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93dde4b91..164d84912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -apt (0.9.1+nmu1) unstable; urgency=low +apt (0.9.2) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/deb/deblistparser.cc: - - only treat the native apt as essential by default + - only treat the native apt as essential by default (Closes: #669377) * apt-pkg/contrib/fileutl.cc: - redirect stderr from compressors to /dev/null - -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Apr 2012 11:04:37 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Apr 2012 15:52:59 +0200 apt (0.9.1) unstable; urgency=low -- cgit v1.2.3 From d8e25d34e89d66b4c38d6b19b4bb2af08f5bd019 Mon Sep 17 00:00:00 2001 From: Malcolm Scott <launchpad@malc.org.uk> Date: Thu, 19 Apr 2012 22:38:30 +0200 Subject: * apt-pkg/packagemanager.cc: - iterate over all pre-depends or-group member instead of looping endlessly over the first member in SmartUnpack (LP: #985852) --- apt-pkg/packagemanager.cc | 4 ++-- debian/changelog | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 093999bc2..b56619ef5 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -621,7 +621,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c // Look for easy targets: packages that are already okay for (DepIterator Cur = Start; Bad == true; ++Cur) { - SPtrArray<Version *> VList = Start.AllTargets(); + SPtrArray<Version *> VList = Cur.AllTargets(); for (Version **I = VList; *I != 0; ++I) { VerIterator Ver(Cache,*I); @@ -644,7 +644,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c // Look for something that could be configured. for (DepIterator Cur = Start; Bad == true; ++Cur) { - SPtrArray<Version *> VList = Start.AllTargets(); + SPtrArray<Version *> VList = Cur.AllTargets(); for (Version **I = VList; *I != 0; ++I) { VerIterator Ver(Cache,*I); diff --git a/debian/changelog b/debian/changelog index 164d84912..aa88bdd93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,12 @@ apt (0.9.2) unstable; urgency=low * apt-pkg/contrib/fileutl.cc: - redirect stderr from compressors to /dev/null - -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Apr 2012 15:52:59 +0200 + [ Malcolm Scott ] + * apt-pkg/packagemanager.cc: + - iterate over all pre-depends or-group member instead of looping + endlessly over the first member in SmartUnpack (LP: #985852) + + -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Apr 2012 22:38:02 +0200 apt (0.9.1) unstable; urgency=low -- cgit v1.2.3 From f0633b216cd019ac0c508a46440943c91f07f65d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 19 Apr 2012 22:41:25 +0200 Subject: add a very simple testcase for the lp#985852 fix in the previous commit --- ...-ubuntu-bug-985852-pre-depends-or-group-ordering | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering diff --git a/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering b/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering new file mode 100755 index 000000000..462acad00 --- /dev/null +++ b/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +insertinstalledpackage 'custom' 'amd64' '1.0' 'Pre-Depends: grub-pc | grub' +insertinstalledpackage 'grub' 'amd64' '1.0' +insertpackage 'unstable' 'custom' 'amd64' '2.0' 'Pre-Depends: grub-pc | grub' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be upgraded: + custom +1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst custom [1.0] (2.0 unstable [amd64]) +Conf custom (2.0 unstable [amd64])' aptget dist-upgrade -s -- cgit v1.2.3 From d4621f8277a76f3e5c87b06f7abd93df04446efc Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 20 Apr 2012 09:12:56 +0200 Subject: cherry pick r1975 from lp:~ubuntu-core-dev/apt/ubuntu --- apt-pkg/deb/dpkgpm.cc | 1 + debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index be11870fd..14376f649 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -738,6 +738,7 @@ bool pkgDPkgPM::OpenLog() d->history_out = fopen(history_name.c_str(),"a"); if (d->history_out == NULL) return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str()); + SetCloseExec(fileno(d->history_out), true); chmod(history_name.c_str(), 0644); fprintf(d->history_out, "\nStart-Date: %s\n", timestr); string remove, purge, install, reinstall, upgrade, downgrade; diff --git a/debian/changelog b/debian/changelog index 50d6ea3ce..fa4cdc251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,12 @@ apt (0.8.16~exp13) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 18:12:57 +0100 +apt (0.8.16~exp12ubuntu8) precise; urgency=low + + * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010) + + -- Adam Conrad <adconrad@ubuntu.com> Thu, 12 Apr 2012 16:26:20 -0600 + apt (0.8.16~exp12) experimental; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 858fd39f6adea6353e9367759cf48ae2b439ffcc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 20 Apr 2012 09:52:17 +0200 Subject: * apt-pkg/aptconfiguration.cc: - if the compressor is not installed, but we link against it's library accept it as a CompressionType (Closes: #669328) --- apt-pkg/aptconfiguration.cc | 25 +++++++++++++------------ debian/changelog | 6 +++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index d72b0c5ae..f0cd8ebc0 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -47,6 +47,7 @@ const Configuration::getCompressionTypes(bool const &Cached) { _config->CndSet("Acquire::CompressionTypes::gz","gzip"); setDefaultConfigurationForCompressors(); + std::vector<APT::Configuration::Compressor> const compressors = getCompressors(); // accept non-list order as override setting for config settings on commandline std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order",""); @@ -63,12 +64,12 @@ const Configuration::getCompressionTypes(bool const &Cached) { if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false) continue; // ignore types we have no app ready to use - std::string const appsetting = std::string("Dir::Bin::").append(*o); - if (_config->Exists(appsetting) == true) { - std::string const app = _config->FindFile(appsetting.c_str(), ""); - if (app.empty() == false && FileExists(app) == false) - continue; - } + std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); + for (; c != compressors.end(); ++c) + if (c->Name == *o) + break; + if (c == compressors.end()) + continue; types.push_back(*o); } @@ -84,12 +85,12 @@ const Configuration::getCompressionTypes(bool const &Cached) { if (std::find(types.begin(),types.end(),Types->Tag) != types.end()) continue; // ignore types we have no app ready to use - std::string const appsetting = std::string("Dir::Bin::").append(Types->Value); - if (appsetting.empty() == false && _config->Exists(appsetting) == true) { - std::string const app = _config->FindFile(appsetting.c_str(), ""); - if (app.empty() == false && FileExists(app) == false) - continue; - } + std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); + for (; c != compressors.end(); ++c) + if (c->Name == Types->Value) + break; + if (c == compressors.end()) + continue; types.push_back(Types->Tag); } diff --git a/debian/changelog b/debian/changelog index aa88bdd93..c65c0249c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,13 +5,17 @@ apt (0.9.2) unstable; urgency=low - only treat the native apt as essential by default (Closes: #669377) * apt-pkg/contrib/fileutl.cc: - redirect stderr from compressors to /dev/null + * apt-pkg/aptconfiguration.cc: + - if the compressor is not installed, but we link against it's + library accept it as a CompressionType (Closes: #669328) + [ Malcolm Scott ] * apt-pkg/packagemanager.cc: - iterate over all pre-depends or-group member instead of looping endlessly over the first member in SmartUnpack (LP: #985852) - -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Apr 2012 22:38:02 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 20 Apr 2012 09:52:01 +0200 apt (0.9.1) unstable; urgency=low -- cgit v1.2.3 From 5149632eb5af0831a8728e8bb5d5c483d6e3f147 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 20 Apr 2012 09:53:24 +0200 Subject: * apt-pkg/contrib/sha2_internal.cc: - do not use the input data directly but memcpy it instead as it could be unaligned as in the http-transport which causes a sigbus error on sparc (Closes: #669061) --- apt-pkg/contrib/sha2_internal.cc | 8 ++++++-- debian/changelog | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc index 6d27e8f2b..83b5a98d3 100644 --- a/apt-pkg/contrib/sha2_internal.cc +++ b/apt-pkg/contrib/sha2_internal.cc @@ -552,7 +552,9 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) { } while (len >= SHA256_BLOCK_LENGTH) { /* Process as many complete blocks as we can */ - SHA256_Transform(context, (sha2_word32*)data); + sha2_byte buffer[SHA256_BLOCK_LENGTH]; + MEMCPY_BCOPY(buffer, data, SHA256_BLOCK_LENGTH); + SHA256_Transform(context, (sha2_word32*)buffer); context->bitcount += SHA256_BLOCK_LENGTH << 3; len -= SHA256_BLOCK_LENGTH; data += SHA256_BLOCK_LENGTH; @@ -879,7 +881,9 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) { } while (len >= SHA512_BLOCK_LENGTH) { /* Process as many complete blocks as we can */ - SHA512_Transform(context, (sha2_word64*)data); + sha2_byte buffer[SHA512_BLOCK_LENGTH]; + MEMCPY_BCOPY(buffer, data, SHA512_BLOCK_LENGTH); + SHA512_Transform(context, (sha2_word64*)buffer); ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3); len -= SHA512_BLOCK_LENGTH; data += SHA512_BLOCK_LENGTH; diff --git a/debian/changelog b/debian/changelog index c65c0249c..4d4d6a70e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ apt (0.9.2) unstable; urgency=low * apt-pkg/aptconfiguration.cc: - if the compressor is not installed, but we link against it's library accept it as a CompressionType (Closes: #669328) + * apt-pkg/contrib/sha2_internal.cc: + - do not use the input data directly but memcpy it instead as + it could be unaligned as in the http-transport which causes + a sigbus error on sparc (Closes: #669061) [ Malcolm Scott ] @@ -15,7 +19,7 @@ apt (0.9.2) unstable; urgency=low - iterate over all pre-depends or-group member instead of looping endlessly over the first member in SmartUnpack (LP: #985852) - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 20 Apr 2012 09:52:01 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 20 Apr 2012 09:52:21 +0200 apt (0.9.1) unstable; urgency=low -- cgit v1.2.3 From e6a12579e9e5d5735eda450cf2bb3986d828ab65 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 20 Apr 2012 10:13:17 +0200 Subject: * apt-pkg/cacheset.cc: - actually return to the fallback modifier if we have detected we should for packagenames which look like modifiers (Closes: #669591) --- apt-pkg/cacheset.cc | 7 +++++-- debian/changelog | 5 ++++- test/integration/test-bug-593360-modifiers-in-names | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index b892ab4bf..e2dbe0e57 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -217,6 +217,7 @@ bool PackageContainerInterface::FromModifierCommandLine(unsigned short &modID, P pkgCacheFile &Cache, const char * cmdline, std::list<Modifier> const &mods, CacheSetHelper &helper) { std::string str = cmdline; + unsigned short fallback = modID; bool modifierPresent = false; for (std::list<Modifier>::const_iterator mod = mods.begin(); mod != mods.end(); ++mod) { @@ -243,6 +244,7 @@ bool PackageContainerInterface::FromModifierCommandLine(unsigned short &modID, P helper.showErrors(errors); if (Pkg.end() == false) { pci->insert(Pkg); + modID = fallback; return true; } } @@ -281,13 +283,14 @@ bool VersionContainerInterface::FromModifierCommandLine(unsigned short &modID, modifierPresent = true; break; } - if (modifierPresent == true) { bool const errors = helper.showErrors(false); bool const found = VersionContainerInterface::FromString(vci, Cache, cmdline, select, helper, true); helper.showErrors(errors); - if (found == true) + if (found == true) { + modID = fallback; return true; + } } return FromString(vci, Cache, str, select, helper); } diff --git a/debian/changelog b/debian/changelog index 4d4d6a70e..18242e081 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ apt (0.9.2) unstable; urgency=low - do not use the input data directly but memcpy it instead as it could be unaligned as in the http-transport which causes a sigbus error on sparc (Closes: #669061) + * apt-pkg/cacheset.cc: + - actually return to the fallback modifier if we have detected we + should for packagenames which look like modifiers (Closes: #669591) [ Malcolm Scott ] @@ -19,7 +22,7 @@ apt (0.9.2) unstable; urgency=low - iterate over all pre-depends or-group member instead of looping endlessly over the first member in SmartUnpack (LP: #985852) - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 20 Apr 2012 09:52:21 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 20 Apr 2012 10:11:24 +0200 apt (0.9.1) unstable; urgency=low diff --git a/test/integration/test-bug-593360-modifiers-in-names b/test/integration/test-bug-593360-modifiers-in-names index 83a3cfabf..74826cbdb 100755 --- a/test/integration/test-bug-593360-modifiers-in-names +++ b/test/integration/test-bug-593360-modifiers-in-names @@ -15,6 +15,11 @@ The following NEW packages will be installed: Inst g++ (4:4.4.5-1 localhost [i386]) Conf g++ (4:4.4.5-1 localhost [i386])' aptget install g++ -s +testequal "Reading package lists... +Building dependency tree... +Package 'g++' is not installed, so not removed +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove g++ -s + testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: -- cgit v1.2.3 From 79b207bc0a3a7d9cef91f96e6061ea35451c563a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 20 Apr 2012 11:05:35 +0200 Subject: fix a bug uncovered by the previous commit which checks if a Compressor preference given by the Order setting is really available before adding it as possible CompressionType. --- apt-pkg/aptconfiguration.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index f0cd8ebc0..e1225b3e6 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -61,12 +61,14 @@ const Configuration::getCompressionTypes(bool const &Cached) { if ((*o).empty() == true) continue; // ignore types we have no method ready to use - if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false) + std::string const method = std::string("Acquire::CompressionTypes::").append(*o); + if (_config->Exists(method) == false) continue; // ignore types we have no app ready to use + std::string const app = _config->Find(method); std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); for (; c != compressors.end(); ++c) - if (c->Name == *o) + if (c->Name == app) break; if (c == compressors.end()) continue; -- cgit v1.2.3 From 4d74894b85227f42b65a84f459f011d74946e4f4 Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Fri, 20 Apr 2012 14:30:39 +0200 Subject: releasing version 0.9.2 --- configure.in | 2 +- debian/changelog | 4 ++-- doc/po/apt-doc.pot | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index b75953339..e993c7f4e 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.1" +PACKAGE_VERSION="0.9.2" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 2f5a3dc5c..e0c178a18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.2) UNRELEASED; urgency=low +apt (0.9.2) unstable; urgency=low [ Michael Vogt ] * apt-inst/contrib/extracttar.cc: @@ -34,7 +34,7 @@ apt (0.9.2) UNRELEASED; urgency=low - iterate over all pre-depends or-group member instead of looping endlessly over the first member in SmartUnpack (LP: #985852) - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 20 Apr 2012 10:11:24 +0200 + -- Michael Vogt <mvo@debian.org> Fri, 20 Apr 2012 11:26:16 +0200 apt (0.9.1) unstable; urgency=low diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 82b120125..fee898f3c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-04-17 09:49+0300\n" +"POT-Creation-Date: 2012-04-20 14:20+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" -- cgit v1.2.3 From 5076b3c220bb6e9e99d79d390e919da132b67215 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 21 Apr 2012 18:26:49 +0200 Subject: * apt-pkg/contrib/strutl.cc: - remove the message size limit from ioprintf and strprintf --- apt-pkg/contrib/strutl.cc | 57 ++++++++++++++++++++++++++++++----------------- debian/changelog | 8 +++++++ 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 99efa8d98..ca096d736 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -23,6 +23,7 @@ #include <ctype.h> #include <string.h> +#include <sstream> #include <stdio.h> #include <algorithm> #include <unistd.h> @@ -1168,34 +1169,50 @@ unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin, return Hits; } /*}}}*/ -// ioprintf - C format string outputter to C++ iostreams /*{{{*/ +// {str,io}printf - C format string outputter to C++ strings/iostreams /*{{{*/ // --------------------------------------------------------------------- /* This is used to make the internationalization strings easier to translate and to allow reordering of parameters */ -void ioprintf(ostream &out,const char *format,...) +static bool iovprintf(ostream &out, const char *format, + va_list &args, ssize_t &size) { + char *S = (char*)malloc(size); + ssize_t const n = vsnprintf(S, size, format, args); + if (n > -1 && n < size) { + out << S; + free(S); + return true; + } else { + if (n > -1) + size = n + 1; + else + size *= 2; + } + free(S); + return false; +} +void ioprintf(ostream &out,const char *format,...) { va_list args; - va_start(args,format); - - // sprintf the description - char S[4096]; - vsnprintf(S,sizeof(S),format,args); - out << S; + ssize_t size = 400; + while (true) { + va_start(args,format); + if (iovprintf(out, format, args, size) == true) + return; + va_end(args); + } } - /*}}}*/ -// strprintf - C format string outputter to C++ strings /*{{{*/ -// --------------------------------------------------------------------- -/* This is used to make the internationalization strings easier to translate - and to allow reordering of parameters */ -void strprintf(string &out,const char *format,...) +void strprintf(string &out,const char *format,...) { va_list args; - va_start(args,format); - - // sprintf the description - char S[4096]; - vsnprintf(S,sizeof(S),format,args); - out = string(S); + ssize_t size = 400; + std::ostringstream outstr; + while (true) { + va_start(args,format); + if (iovprintf(outstr, format, args, size) == true) + break; + va_end(args); + } + out = outstr.str(); } /*}}}*/ // safe_snprintf - Safer snprintf /*{{{*/ diff --git a/debian/changelog b/debian/changelog index e0c178a18..a90aa68aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.3) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/contrib/strutl.cc: + - remove the message size limit from ioprintf and strprintf + + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 21 Apr 2012 18:26:31 +0200 + apt (0.9.2) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 2f4162708d9db7c71590370cc998d46e8386c757 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 22 Apr 2012 12:28:10 +0200 Subject: * apt-pkg/contrib/configuration.cc: - add a more versatile Dump() method --- apt-pkg/contrib/configuration.cc | 72 +++++++++++++++++++++++++++++++++++----- apt-pkg/contrib/configuration.h | 2 ++ debian/changelog | 4 ++- 3 files changed, 69 insertions(+), 9 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 36866a35a..ff80dfaf8 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -482,24 +482,80 @@ bool Configuration::ExistsAny(const char *Name) const /* Dump the entire configuration space */ void Configuration::Dump(ostream& str) { - /* Write out all of the configuration directives by walking the + Dump(str, NULL, "%f \"%v\";\n", true); +} +void Configuration::Dump(ostream& str, char const * const root, + char const * const formatstr, bool const emptyValue) +{ + const Configuration::Item* Top = Tree(root); + if (Top == 0) + return; + const Configuration::Item* const Root = (root == NULL) ? NULL : Top; + std::vector<std::string> const format = VectorizeString(formatstr, '%'); + + /* Write out all of the configuration directives by walking the configuration tree */ - const Configuration::Item *Top = Tree(0); - for (; Top != 0;) - { - str << Top->FullTag() << " \"" << Top->Value << "\";" << endl; - + do { + if (emptyValue == true || Top->Value.empty() == emptyValue) + { + std::vector<std::string>::const_iterator f = format.begin(); + str << *f; + for (++f; f != format.end(); ++f) + { + if (f->empty() == true) + { + ++f; + str << '%' << *f; + continue; + } + char const type = (*f)[0]; + if (type == 'f') + str << Top->FullTag(); + else if (type == 't') + str << Top->Tag; + else if (type == 'v') + str << Top->Value; + else if (type == 'F') + str << QuoteString(Top->FullTag(), "=\"\n"); + else if (type == 'T') + str << QuoteString(Top->Tag, "=\"\n"); + else if (type == 'V') + str << QuoteString(Top->Value, "=\"\n"); + else if (type == 'n') + str << "\n"; + else if (type == 'N') + str << "\t"; + else + str << '%' << type; + str << f->c_str() + 1; + } + } + if (Top->Child != 0) { Top = Top->Child; continue; } - + while (Top != 0 && Top->Next == 0) Top = Top->Parent; if (Top != 0) Top = Top->Next; - } + + if (Root != NULL) + { + const Configuration::Item* I = Top; + while(I != 0) + { + if (I == Root) + break; + else + I = I->Parent; + } + if (I == 0) + break; + } + } while (Top != 0); } /*}}}*/ diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 4c2e75041..ea94c2fe6 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -103,6 +103,8 @@ class Configuration inline void Dump() { Dump(std::clog); }; void Dump(std::ostream& str); + void Dump(std::ostream& str, char const * const root, + char const * const format, bool const emptyValue); Configuration(const Item *Root); Configuration(); diff --git a/debian/changelog b/debian/changelog index a90aa68aa..cbbedda0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ apt (0.9.3) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/strutl.cc: - remove the message size limit from ioprintf and strprintf + * apt-pkg/contrib/configuration.cc: + - add a more versatile Dump() method - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 21 Apr 2012 18:26:31 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 12:27:47 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From d280d03ac50f2b49f7c08f825dccdebf61b62c57 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 22 Apr 2012 12:28:54 +0200 Subject: * apt-pkg/acquire-worker.cc: - use Dump() to generate the configuration message for sending --- apt-pkg/acquire-worker.cc | 39 +++++++++------------------------------ debian/changelog | 4 +++- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 77e2fc311..8bc043c58 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -467,40 +467,19 @@ bool pkgAcquire::Worker::SendConfiguration() if (OutFd == -1) return false; - - string Message = "601 Configuration\n"; - Message.reserve(2000); - /* Write out all of the configuration directives by walking the + /* Write out all of the configuration directives by walking the configuration tree */ - const Configuration::Item *Top = _config->Tree(0); - for (; Top != 0;) - { - if (Top->Value.empty() == false) - { - string Line = "Config-Item: " + QuoteString(Top->FullTag(),"=\"\n") + "="; - Line += QuoteString(Top->Value,"\n") + '\n'; - Message += Line; - } - - if (Top->Child != 0) - { - Top = Top->Child; - continue; - } - - while (Top != 0 && Top->Next == 0) - Top = Top->Parent; - if (Top != 0) - Top = Top->Next; - } - Message += '\n'; + std::ostringstream Message; + Message << "601 Configuration\n"; + _config->Dump(Message, NULL, "Config-Item: %F=%V\n", false); + Message << '\n'; if (Debug == true) - clog << " -> " << Access << ':' << QuoteString(Message,"\n") << endl; - OutQueue += Message; - OutReady = true; - + clog << " -> " << Access << ':' << QuoteString(Message.str(),"\n") << endl; + OutQueue += Message.str(); + OutReady = true; + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index cbbedda0d..79c09b092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ apt (0.9.3) unstable; urgency=low - remove the message size limit from ioprintf and strprintf * apt-pkg/contrib/configuration.cc: - add a more versatile Dump() method + * apt-pkg/acquire-worker.cc: + - use Dump() to generate the configuration message for sending - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 12:27:47 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 12:28:13 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From a88136062dbe189417aa0b4751449637816c8445 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 22 Apr 2012 12:29:24 +0200 Subject: * cmdline/apt-config.cc: - make it possible to limit dump to a subtree - implement --empty and --format option for dump --- cmdline/apt-config.cc | 10 +++++++++- debian/changelog | 5 ++++- doc/apt-config.8.xml | 16 +++++++++++++++- doc/apt-verbatim.ent | 3 +++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 79ae944df..397ce32df 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -63,7 +63,13 @@ bool DoShell(CommandLine &CmdL) /* */ bool DoDump(CommandLine &CmdL) { - _config->Dump(cout); + bool const empty = _config->FindB("APT::Config::Dump::EmptyValue", true); + std::string const format = _config->Find("APT::Config::Dump::Format", "%f \"%v\";\n"); + if (CmdL.FileSize() == 1) + _config->Dump(cout, NULL, format.c_str(), empty); + else + for (const char **I = CmdL.FileList + 1; *I != 0; ++I) + _config->Dump(cout, *I, format.c_str(), empty); return true; } /*}}}*/ @@ -100,6 +106,8 @@ int main(int argc,const char *argv[]) /*{{{*/ {'v',"version","version",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, + {0,"empty","APT::Config::Dump::EmptyValue",CommandLine::Boolean}, + {0,"format","APT::Config::Dump::Format",CommandLine::HasArg}, {0,0,0,0}}; CommandLine::Dispatch Cmds[] = {{"shell",&DoShell}, {"dump",&DoDump}, diff --git a/debian/changelog b/debian/changelog index 79c09b092..97a7855fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ apt (0.9.3) unstable; urgency=low - add a more versatile Dump() method * apt-pkg/acquire-worker.cc: - use Dump() to generate the configuration message for sending + * cmdline/apt-config.cc: + - make it possible to limit dump to a subtree + - implement --empty and --format option for dump - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 12:28:13 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 12:29:07 +0200 apt (0.9.2) unstable; urgency=low diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index b6fcf4bf2..94aeec059 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -85,7 +85,21 @@ eval $RES &apt-cmdblurb; <variablelist> - + <varlistentry> + <term><option>--empty</option></term> + <listitem><para>Include options which have an empty value. This is the default, so + use --no-empty to remove them from the output.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--format '<replaceable>%f "%v";%n</replaceable>'</option></term> + <listitem><para>Defines the output of each config option. %t will be replaced with the tagname, + %f with the complete tagname and %v with the value of the option. + Use uppercase letters and the respective values will be quoted. Additionally + %n will be replaced by a newline, %N by a tab. A % can be + printed by using %%.</para></listitem> + </varlistentry> + &apt-commonoptions; </variablelist> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index ad4554e2f..3846c17e3 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -269,8 +269,11 @@ &synopsis-help; </group> </cmdsynopsis></refsynopsisdiv>"> +<!--<arg><option>- -format '<replaceable>%f \"%v\";%n</replaceable>'</option></arg>--> <!ENTITY synopsis-command-apt-config "<refsynopsisdiv><cmdsynopsis> <command>apt-config</command> + <arg><option>--empty</option></arg> + <arg><option>--format '<replaceable>%f "%v";%n</replaceable>'</option></arg> &synopsis-arg-option; &synopsis-arg-config; <group choice='req'> -- cgit v1.2.3 From 849e64ac558c5c72a65b6ee0098fdfc538eca5e6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 22 Apr 2012 13:01:37 +0200 Subject: * apt-pkg/cdrom.cc: - use Dump() to generate the configuration output --- apt-pkg/cdrom.cc | 21 ++------------------- debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 50c204371..c10ca6bd1 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -409,27 +409,10 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf) /* Write out all of the configuration directives by walking the configuration tree */ - const Configuration::Item *Top = Cnf.Tree(0); - for (; Top != 0;) - { - // Print the config entry - if (Top->Value.empty() == false) - Out << Top->FullTag() + " \"" << Top->Value << "\";" << endl; - - if (Top->Child != 0) - { - Top = Top->Child; - continue; - } - - while (Top != 0 && Top->Next == 0) - Top = Top->Parent; - if (Top != 0) - Top = Top->Next; - } + _config->Dump(Out, NULL, "%f \"%v\";\n", false); Out.close(); - + if (FileExists(DFile) == true && link(DFile.c_str(),string(DFile + '~').c_str()) != 0) return _error->Errno("link", "Failed to link %s to %s~", DFile.c_str(), DFile.c_str()); if (rename(NewFile.c_str(),DFile.c_str()) != 0) diff --git a/debian/changelog b/debian/changelog index 97a7855fb..145da311e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,10 @@ apt (0.9.3) unstable; urgency=low * cmdline/apt-config.cc: - make it possible to limit dump to a subtree - implement --empty and --format option for dump + * apt-pkg/cdrom.cc: + - use Dump() to generate the configuration output - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 12:29:07 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 13:01:04 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From 074da0970c68879d548b6b4f64d0da7f38151248 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 23 Apr 2012 17:46:11 +0200 Subject: * apt-pkg/depcache.cc: - clearly separate 'positive' and 'negative' dependencies and their upgrade-resolution tries in MarkInstall and especially don't treat Conflicts differently compared to Breaks here --- apt-pkg/depcache.cc | 25 ++-- debian/changelog | 6 +- .../test-ignore-provides-if-versioned-breaks | 150 +++++++++++++++++++++ .../test-ignore-provides-if-versioned-conflicts | 150 +++++++++++++++++++++ 4 files changed, 318 insertions(+), 13 deletions(-) create mode 100755 test/integration/test-ignore-provides-if-versioned-breaks create mode 100755 test/integration/test-ignore-provides-if-versioned-conflicts diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 1eea55560..daf7c8c4d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1152,9 +1152,8 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } /* This bit is for processing the possibilty of an install/upgrade - fixing the problem */ - if (Start->Type != Dep::DpkgBreaks && - (DepState[Start->ID] & DepCVer) == DepCVer) + fixing the problem for "positive" dependencies */ + if (Start.IsNegative() == false && (DepState[Start->ID] & DepCVer) == DepCVer) { APT::VersionList verlist; pkgCache::VerIterator Cand = PkgState[Start.TargetPkg()->ID].CandidateVerIter(*this); @@ -1198,13 +1197,13 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } continue; } - - /* For conflicts we just de-install the package and mark as auto, - Conflicts may not have or groups. For dpkg's Breaks we try to - upgrade the package. */ - if (Start.IsNegative() == true) + /* Negative dependencies have no or-group + If the dependency isn't versioned, we try if an upgrade might solve the problem. + Otherwise we remove the offender if needed */ + else if (Start.IsNegative() == true && Start->Type != pkgCache::Dep::Obsoletes) { SPtrArray<Version *> List = Start.AllTargets(); + pkgCache::PkgIterator TrgPkg = Start.TargetPkg(); for (Version **I = List; *I != 0; I++) { VerIterator Ver(*this,*I); @@ -1215,15 +1214,17 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (PkgState[Pkg->ID].InstallVer == 0) continue; - if (PkgState[Pkg->ID].CandidateVer != *I && - Start->Type == Dep::DpkgBreaks && + if ((Start->Version != 0 || TrgPkg != Pkg) && + PkgState[Pkg->ID].CandidateVer != PkgState[Pkg->ID].InstallVer && + PkgState[Pkg->ID].CandidateVer != *I && MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true) continue; - else if (MarkDelete(Pkg,false,Depth + 1, false) == false) + else if ((Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::DpkgBreaks) && + MarkDelete(Pkg,false,Depth + 1, false) == false) break; } continue; - } + } } return Dep.end() == true; diff --git a/debian/changelog b/debian/changelog index 145da311e..e585530ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,12 @@ apt (0.9.3) unstable; urgency=low - implement --empty and --format option for dump * apt-pkg/cdrom.cc: - use Dump() to generate the configuration output + * apt-pkg/depcache.cc: + - clearly separate 'positive' and 'negative' dependencies and + their upgrade-resolution tries in MarkInstall and especially don't + treat Conflicts differently compared to Breaks here - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 22 Apr 2012 13:01:04 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 17:43:53 +0200 apt (0.9.2) unstable; urgency=low diff --git a/test/integration/test-ignore-provides-if-versioned-breaks b/test/integration/test-ignore-provides-if-versioned-breaks new file mode 100755 index 000000000..f8b4544a0 --- /dev/null +++ b/test/integration/test-ignore-provides-if-versioned-breaks @@ -0,0 +1,150 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'i386' 'amd64' + +insertpackage 'unstable' 'unrlated' 'all' '1.0' + +insertinstalledpackage 'foo' 'i386' '2.0' +insertpackage 'unstable' 'foo' 'i386' '4.0' +insertpackage 'unstable' 'foo-provider' 'i386' '1.0' 'Provides: foo' +insertpackage 'unstable' 'foo-breaker-3' 'i386' '1.0' 'Breaks: foo (<< 3.0)' +insertpackage 'unstable' 'foo-breaker-2' 'i386' '1.0' 'Breaks: foo (<< 2.0)' +insertpackage 'unstable' 'foo-breaker-none' 'i386' '1.0' 'Breaks: foo' + +insertinstalledpackage 'foo-foreign' 'amd64' '2.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'foo-foreign' 'amd64' '4.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'foo-foreign-provider' 'i386' '1.0' 'Provides: foo-foreign' +insertpackage 'unstable' 'foo-foreign-breaker-3' 'i386' '1.0' 'Breaks: foo-foreign (<< 3.0)' +insertpackage 'unstable' 'foo-foreign-breaker-2' 'i386' '1.0' 'Breaks: foo-foreign (<< 2.0)' +insertpackage 'unstable' 'foo-foreign-breaker-none' 'i386' '1.0' 'Breaks: foo-foreign' + +insertinstalledpackage 'foo-same' 'i386,amd64' '2.0' 'Multi-Arch: same' +insertpackage 'unstable' 'foo-same' 'i386,amd64' '4.0' 'Multi-Arch: same' +insertpackage 'unstable' 'foo-same-provider' 'i386' '1.0' 'Provides: foo-same' +insertpackage 'unstable' 'foo-same-breaker-3' 'i386' '1.0' 'Breaks: foo-same (<< 3.0)' +insertpackage 'unstable' 'foo-same-breaker-2' 'i386' '1.0' 'Breaks: foo-same (<< 2.0)' +insertpackage 'unstable' 'foo-same-breaker-none' 'i386' '1.0' 'Breaks: foo-same' + + + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo-breaker-none : Breaks: foo +E: Unable to correct problems, you have held broken packages.' aptget install foo-provider foo-breaker-none -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo-breaker-2 foo-provider +0 upgraded, 2 newly installed, 0 to remove and 4 not upgraded. +Inst foo-breaker-2 (1.0 unstable [i386]) +Inst foo-provider (1.0 unstable [i386]) +Conf foo-breaker-2 (1.0 unstable [i386]) +Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + foo-breaker-3 foo-provider +The following packages will be upgraded: + foo +1 upgraded, 2 newly installed, 0 to remove and 3 not upgraded. +Inst foo [2.0] (4.0 unstable [i386]) +Inst foo-breaker-3 (1.0 unstable [i386]) +Inst foo-provider (1.0 unstable [i386]) +Conf foo (4.0 unstable [i386]) +Conf foo-breaker-3 (1.0 unstable [i386]) +Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-3 -s + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo-foreign-breaker-none : Breaks: foo-foreign +E: Unable to correct problems, you have held broken packages.' aptget install foo-foreign-provider foo-foreign-breaker-none -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo-foreign-breaker-2 foo-foreign-provider +0 upgraded, 2 newly installed, 0 to remove and 4 not upgraded. +Inst foo-foreign-breaker-2 (1.0 unstable [i386]) +Inst foo-foreign-provider (1.0 unstable [i386]) +Conf foo-foreign-breaker-2 (1.0 unstable [i386]) +Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo-foreign:amd64 +The following NEW packages will be installed: + foo-foreign-breaker-3 foo-foreign-provider +The following packages will be upgraded: + foo-foreign:amd64 +1 upgraded, 2 newly installed, 0 to remove and 3 not upgraded. +Inst foo-foreign:amd64 [2.0] (4.0 unstable [amd64]) +Inst foo-foreign-breaker-3 (1.0 unstable [i386]) +Inst foo-foreign-provider (1.0 unstable [i386]) +Conf foo-foreign:amd64 (4.0 unstable [amd64]) +Conf foo-foreign-breaker-3 (1.0 unstable [i386]) +Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-3 -s + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo-same-breaker-none : Breaks: foo-same +E: Unable to correct problems, you have held broken packages.' aptget install foo-same-provider foo-same-breaker-none -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo-same-breaker-2 foo-same-provider +0 upgraded, 2 newly installed, 0 to remove and 4 not upgraded. +Inst foo-same-breaker-2 (1.0 unstable [i386]) +Inst foo-same-provider (1.0 unstable [i386]) +Conf foo-same-breaker-2 (1.0 unstable [i386]) +Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo-same:amd64 foo-same +The following NEW packages will be installed: + foo-same-breaker-3 foo-same-provider +The following packages will be upgraded: + foo-same:amd64 foo-same +2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded. +Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ] +Inst foo-same [2.0] (4.0 unstable [i386]) +Conf foo-same:amd64 (4.0 unstable [amd64]) +Conf foo-same (4.0 unstable [i386]) +Inst foo-same-breaker-3 (1.0 unstable [i386]) +Inst foo-same-provider (1.0 unstable [i386]) +Conf foo-same-breaker-3 (1.0 unstable [i386]) +Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts new file mode 100755 index 000000000..44eafcff1 --- /dev/null +++ b/test/integration/test-ignore-provides-if-versioned-conflicts @@ -0,0 +1,150 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'i386' 'amd64' + +insertpackage 'unstable' 'unrlated' 'all' '1.0' + +insertinstalledpackage 'foo' 'i386' '2.0' +insertpackage 'unstable' 'foo' 'i386' '4.0' +insertpackage 'unstable' 'foo-provider' 'i386' '1.0' 'Provides: foo' +insertpackage 'unstable' 'foo-breaker-3' 'i386' '1.0' 'Conflicts: foo (<< 3.0)' +insertpackage 'unstable' 'foo-breaker-2' 'i386' '1.0' 'Conflicts: foo (<< 2.0)' +insertpackage 'unstable' 'foo-breaker-none' 'i386' '1.0' 'Conflicts: foo' + +insertinstalledpackage 'foo-foreign' 'amd64' '2.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'foo-foreign' 'amd64' '4.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'foo-foreign-provider' 'i386' '1.0' 'Provides: foo-foreign' +insertpackage 'unstable' 'foo-foreign-breaker-3' 'i386' '1.0' 'Conflicts: foo-foreign (<< 3.0)' +insertpackage 'unstable' 'foo-foreign-breaker-2' 'i386' '1.0' 'Conflicts: foo-foreign (<< 2.0)' +insertpackage 'unstable' 'foo-foreign-breaker-none' 'i386' '1.0' 'Conflicts: foo-foreign' + +insertinstalledpackage 'foo-same' 'i386,amd64' '2.0' 'Multi-Arch: same' +insertpackage 'unstable' 'foo-same' 'i386,amd64' '4.0' 'Multi-Arch: same' +insertpackage 'unstable' 'foo-same-provider' 'i386' '1.0' 'Provides: foo-same' +insertpackage 'unstable' 'foo-same-breaker-3' 'i386' '1.0' 'Conflicts: foo-same (<< 3.0)' +insertpackage 'unstable' 'foo-same-breaker-2' 'i386' '1.0' 'Conflicts: foo-same (<< 2.0)' +insertpackage 'unstable' 'foo-same-breaker-none' 'i386' '1.0' 'Conflicts: foo-same' + + + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo-breaker-none : Conflicts: foo +E: Unable to correct problems, you have held broken packages.' aptget install foo-provider foo-breaker-none -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo-breaker-2 foo-provider +0 upgraded, 2 newly installed, 0 to remove and 4 not upgraded. +Inst foo-breaker-2 (1.0 unstable [i386]) +Inst foo-provider (1.0 unstable [i386]) +Conf foo-breaker-2 (1.0 unstable [i386]) +Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + foo-breaker-3 foo-provider +The following packages will be upgraded: + foo +1 upgraded, 2 newly installed, 0 to remove and 3 not upgraded. +Inst foo [2.0] (4.0 unstable [i386]) +Inst foo-breaker-3 (1.0 unstable [i386]) +Inst foo-provider (1.0 unstable [i386]) +Conf foo (4.0 unstable [i386]) +Conf foo-breaker-3 (1.0 unstable [i386]) +Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-3 -s + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo-foreign-breaker-none : Conflicts: foo-foreign +E: Unable to correct problems, you have held broken packages.' aptget install foo-foreign-provider foo-foreign-breaker-none -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo-foreign-breaker-2 foo-foreign-provider +0 upgraded, 2 newly installed, 0 to remove and 4 not upgraded. +Inst foo-foreign-breaker-2 (1.0 unstable [i386]) +Inst foo-foreign-provider (1.0 unstable [i386]) +Conf foo-foreign-breaker-2 (1.0 unstable [i386]) +Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo-foreign:amd64 +The following NEW packages will be installed: + foo-foreign-breaker-3 foo-foreign-provider +The following packages will be upgraded: + foo-foreign:amd64 +1 upgraded, 2 newly installed, 0 to remove and 3 not upgraded. +Inst foo-foreign:amd64 [2.0] (4.0 unstable [amd64]) +Inst foo-foreign-breaker-3 (1.0 unstable [i386]) +Inst foo-foreign-provider (1.0 unstable [i386]) +Conf foo-foreign:amd64 (4.0 unstable [amd64]) +Conf foo-foreign-breaker-3 (1.0 unstable [i386]) +Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-3 -s + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo-same-breaker-none : Conflicts: foo-same +E: Unable to correct problems, you have held broken packages.' aptget install foo-same-provider foo-same-breaker-none -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo-same-breaker-2 foo-same-provider +0 upgraded, 2 newly installed, 0 to remove and 4 not upgraded. +Inst foo-same-breaker-2 (1.0 unstable [i386]) +Inst foo-same-provider (1.0 unstable [i386]) +Conf foo-same-breaker-2 (1.0 unstable [i386]) +Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo-same:amd64 foo-same +The following NEW packages will be installed: + foo-same-breaker-3 foo-same-provider +The following packages will be upgraded: + foo-same:amd64 foo-same +2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded. +Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ] +Inst foo-same [2.0] (4.0 unstable [i386]) +Conf foo-same:amd64 (4.0 unstable [amd64]) +Conf foo-same (4.0 unstable [i386]) +Inst foo-same-breaker-3 (1.0 unstable [i386]) +Inst foo-same-provider (1.0 unstable [i386]) +Conf foo-same-breaker-3 (1.0 unstable [i386]) +Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s -- cgit v1.2.3 From ecdc4e74bc5ba7eadeff3276bc3707c127d9989c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 23 Apr 2012 18:24:19 +0200 Subject: * edsp/edspsystem.cc: - check with RealFileExists for scenario file as otherwise a directory like one provided with RootDir triggers the usage of EDSP --- apt-pkg/edsp/edspsystem.cc | 2 +- debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc index 6b9207451..aae969d9d 100644 --- a/apt-pkg/edsp/edspsystem.cc +++ b/apt-pkg/edsp/edspsystem.cc @@ -91,7 +91,7 @@ signed edspSystem::Score(Configuration const &Cnf) { if (Cnf.Find("edsp::scenario", "") == "stdin") return 1000; - if (FileExists(Cnf.FindFile("edsp::scenario","")) == true) + if (RealFileExists(Cnf.FindFile("edsp::scenario","")) == true) return 1000; return -1000; } diff --git a/debian/changelog b/debian/changelog index e585530ff..27747e23f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,11 @@ apt (0.9.3) unstable; urgency=low - clearly separate 'positive' and 'negative' dependencies and their upgrade-resolution tries in MarkInstall and especially don't treat Conflicts differently compared to Breaks here + * edsp/edspsystem.cc: + - check with RealFileExists for scenario file as otherwise a directory + like one provided with RootDir triggers the usage of EDSP - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 17:43:53 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 18:23:10 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From ec76891fa17c77f8fd28b9b6e11ef2d7547afe7e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 23 Apr 2012 19:11:11 +0200 Subject: normalize a bit by replacing // and /./ with / in FindFile --- apt-pkg/contrib/configuration.cc | 68 ++++++++++++++++++++++----------------- debian/changelog | 3 +- test/libapt/configuration_test.cc | 13 ++++++++ 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index ff80dfaf8..ce02f1bd2 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -171,48 +171,56 @@ string Configuration::Find(const char *Name,const char *Default) const string Configuration::FindFile(const char *Name,const char *Default) const { const Item *RootItem = Lookup("RootDir"); - std::string rootDir = (RootItem == 0) ? "" : RootItem->Value; - if(rootDir.size() > 0 && rootDir[rootDir.size() - 1] != '/') - rootDir.push_back('/'); + std::string result = (RootItem == 0) ? "" : RootItem->Value; + if(result.empty() == false && result[result.size() - 1] != '/') + result.push_back('/'); const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) { - if (Default == 0) - return rootDir; - else - return rootDir + Default; + if (Default != 0) + result.append(Default); } - - string val = Itm->Value; - while (Itm->Parent != 0) + else { - if (Itm->Parent->Value.empty() == true) + string val = Itm->Value; + while (Itm->Parent != 0) { - Itm = Itm->Parent; - continue; - } + if (Itm->Parent->Value.empty() == true) + { + Itm = Itm->Parent; + continue; + } - // Absolute - if (val.length() >= 1 && val[0] == '/') - break; + // Absolute + if (val.length() >= 1 && val[0] == '/') + break; - // ~/foo or ./foo - if (val.length() >= 2 && (val[0] == '~' || val[0] == '.') && val[1] == '/') - break; - - // ../foo - if (val.length() >= 3 && val[0] == '.' && val[1] == '.' && val[2] == '/') - break; - - if (Itm->Parent->Value.end()[-1] != '/') - val.insert(0, "/"); + // ~/foo or ./foo + if (val.length() >= 2 && (val[0] == '~' || val[0] == '.') && val[1] == '/') + break; + + // ../foo + if (val.length() >= 3 && val[0] == '.' && val[1] == '.' && val[2] == '/') + break; + + if (Itm->Parent->Value.end()[-1] != '/') + val.insert(0, "/"); - val.insert(0, Itm->Parent->Value); - Itm = Itm->Parent; + val.insert(0, Itm->Parent->Value); + Itm = Itm->Parent; + } + result.append(val); } - return rootDir + val; + // do some normalisation by removing // and /./ from the path + size_t found = string::npos; + while ((found = result.find("/./")) != string::npos) + result.replace(found, 3, "/"); + while ((found = result.find("//")) != string::npos) + result.replace(found, 2, "/"); + + return result; } /*}}}*/ // Configuration::FindDir - Find a directory name /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 27747e23f..dc331dc55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.9.3) unstable; urgency=low - remove the message size limit from ioprintf and strprintf * apt-pkg/contrib/configuration.cc: - add a more versatile Dump() method + - normalize a bit by replacing // and /./ with / in FindFile * apt-pkg/acquire-worker.cc: - use Dump() to generate the configuration message for sending * cmdline/apt-config.cc: @@ -20,7 +21,7 @@ apt (0.9.3) unstable; urgency=low - check with RealFileExists for scenario file as otherwise a directory like one provided with RootDir triggers the usage of EDSP - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 18:23:10 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 19:10:13 +0200 apt (0.9.2) unstable; urgency=low diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc index 9a3e2c118..6b657a70c 100644 --- a/test/libapt/configuration_test.cc +++ b/test/libapt/configuration_test.cc @@ -80,6 +80,19 @@ int main(int argc,const char *argv[]) { equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt"); equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude"); + Cnf.Set("RootDir", "/"); + equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt"); + equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude"); + Cnf.Set("RootDir", "//./////.////"); + equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt"); + equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude"); + Cnf.Set("RootDir", "/rootdir"); + equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt"); + equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude"); + Cnf.Set("RootDir", "/rootdir/"); + equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt"); + equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude"); + //FIXME: Test for configuration file parsing; // currently only integration/ tests test them implicitly -- cgit v1.2.3 From af13d1437cbcb383de89f126b316c02587e4b691 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 23 Apr 2012 19:33:32 +0200 Subject: /dev/null is a special absolute path as it has no subdirectories --- apt-pkg/contrib/configuration.cc | 9 +++++++++ debian/changelog | 3 ++- test/libapt/configuration_test.cc | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index ce02f1bd2..4de17e3e1 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -194,7 +194,11 @@ string Configuration::FindFile(const char *Name,const char *Default) const // Absolute if (val.length() >= 1 && val[0] == '/') + { + if (val.compare(0, 9, "/dev/null") == 0) + val.erase(9); break; + } // ~/foo or ./foo if (val.length() >= 2 && (val[0] == '~' || val[0] == '.') && val[1] == '/') @@ -230,7 +234,12 @@ string Configuration::FindDir(const char *Name,const char *Default) const { string Res = FindFile(Name,Default); if (Res.end()[-1] != '/') + { + size_t const found = Res.rfind("/dev/null"); + if (found != string::npos && found == Res.size() - 9) + return Res; // /dev/null returning return Res + '/'; + } return Res; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index dc331dc55..558677345 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.9.3) unstable; urgency=low * apt-pkg/contrib/configuration.cc: - add a more versatile Dump() method - normalize a bit by replacing // and /./ with / in FindFile + - /dev/null is a special absolute path as it has no subdirectories * apt-pkg/acquire-worker.cc: - use Dump() to generate the configuration message for sending * cmdline/apt-config.cc: @@ -21,7 +22,7 @@ apt (0.9.3) unstable; urgency=low - check with RealFileExists for scenario file as otherwise a directory like one provided with RootDir triggers the usage of EDSP - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 19:10:13 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 19:32:29 +0200 apt (0.9.2) unstable; urgency=low diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc index 6b657a70c..87d5699ef 100644 --- a/test/libapt/configuration_test.cc +++ b/test/libapt/configuration_test.cc @@ -93,6 +93,11 @@ int main(int argc,const char *argv[]) { equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt"); equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude"); + Cnf.Set("Dir::State", "/dev/null"); + Cnf.Set("Dir::State::lists", "lists/"); + equals(Cnf.FindDir("Dir::State"), "/rootdir/dev/null"); + equals(Cnf.FindDir("Dir::State::lists"), "/rootdir/dev/null"); + //FIXME: Test for configuration file parsing; // currently only integration/ tests test them implicitly -- cgit v1.2.3 From cc04f4ce9eaaf0945775d5233806de7da5d21ff6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 23 Apr 2012 22:03:23 +0200 Subject: provider is only a possible solution if the provides has the right version (or none as we have no versioned provides in debian) and not if the version of the provider matches --- apt-pkg/depcache.cc | 2 +- debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index daf7c8c4d..2656e9b42 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1164,7 +1164,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, pkgCache::VerIterator V = Prv.OwnerVer(); pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this); if (Cand.end() == true || V != Cand || - VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == false) + VS().CheckDep(Prv.ProvideVersion(), Start->CompareOp, Start.TargetVer()) == false) continue; verlist.insert(Cand); } diff --git a/debian/changelog b/debian/changelog index 558677345..34d6991b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,11 +18,14 @@ apt (0.9.3) unstable; urgency=low - clearly separate 'positive' and 'negative' dependencies and their upgrade-resolution tries in MarkInstall and especially don't treat Conflicts differently compared to Breaks here + - provider is only a possible solution if the provides has the right + version (or none as we have no versioned provides in debian) and not + if the version of the provider matches * edsp/edspsystem.cc: - check with RealFileExists for scenario file as otherwise a directory like one provided with RootDir triggers the usage of EDSP - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 19:32:29 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 22:02:58 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From 154fd04e8870577626fa43546f40273f6edbc9f3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 2 May 2012 19:20:56 +0200 Subject: * debian/libapt-inst1.5.symbols: - use the correct library name the symbols header --- debian/changelog | 4 +++- debian/libapt-inst1.5.symbols | 2 +- prepare-release | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34d6991b5..d77de1b3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,10 @@ apt (0.9.3) unstable; urgency=low * edsp/edspsystem.cc: - check with RealFileExists for scenario file as otherwise a directory like one provided with RootDir triggers the usage of EDSP + * debian/libapt-inst1.5.symbols: + - use the correct library name the symbols header - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 22:02:58 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 19:18:51 +0200 apt (0.9.2) unstable; urgency=low diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index cade0990d..8fcd29a3e 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -1,4 +1,4 @@ -libapt-inst.so.1.4 libapt-inst1.4 #MINVER# +libapt-inst.so.1.5 libapt-inst1.5 #MINVER# * Build-Depends-Package: libapt-pkg-dev (c++)"ExtractTar::Done(bool)@Base" 0.8.0 (c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0 diff --git a/prepare-release b/prepare-release index e02157b24..fd98c489f 100755 --- a/prepare-release +++ b/prepare-release @@ -4,6 +4,23 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') if [ "$1" = 'pre-export' ]; then + libraryversioncheck() { + LIBRARY="$1" + VERSION="$2" + if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then + echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)" + exit 1 + fi + if [ "$(head -n1 "debian/${LIBRARY}${VERSION}.symbols")" != "${LIBRARY}.so.${VERSION} ${LIBRARY}${VERSION} #MINVER#" ]; then + echo >&2 "Library ${LIBRARY}${VERSION} has incorrect version in symbol header! (»$(head -n1 "debian/${LIBRARY}${VERSION}.symbols")«)" + exit 2 + fi + } + + libraryversioncheck 'libapt-pkg' "$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" + libraryversioncheck 'libapt-inst' "$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" + + if [ "$DISTRIBUTION" = 'sid' ]; then echo >&2 '»sid« is not a valid distribution. Replace it with »unstable« for you' sed -i -e 's/) sid; urgency=/) unstable; urgency=/' debian/changelog -- cgit v1.2.3 From 5954d4d2020a247d414c7e064a87f9464be85fcf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 2 May 2012 22:00:02 +0200 Subject: * apt-pkg/pkgcachegen.cc: - check if NewDescription allocation has failed and error out accordingly --- apt-pkg/pkgcachegen.cc | 6 ++++++ debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index ec072fddd..5e0726f3b 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -304,6 +304,9 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator void const * const oldMap = Map.Data(); map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc); + if (unlikely(descindex == 0 && _error->PendingError())) + return _error->Error(_("Error occurred while processing %s (%s%d)"), + Pkg.Name(), "NewDescription", 1); if (oldMap != Map.Data()) LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; *LastDesc = descindex; @@ -456,6 +459,9 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator oldMap = Map.Data(); map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc); + if (unlikely(descindex == 0 && _error->PendingError())) + return _error->Error(_("Error occurred while processing %s (%s%d)"), + Pkg.Name(), "NewDescription", 2); if (oldMap != Map.Data()) LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; *LastDesc = descindex; diff --git a/debian/changelog b/debian/changelog index d77de1b3a..799653d5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,10 @@ apt (0.9.3) unstable; urgency=low like one provided with RootDir triggers the usage of EDSP * debian/libapt-inst1.5.symbols: - use the correct library name the symbols header + * apt-pkg/pkgcachegen.cc: + - check if NewDescription allocation has failed and error out accordingly - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 19:18:51 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 21:59:02 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From fc691496f22e75f5bbb127cf6baff793898220ca Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 2 May 2012 22:31:49 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - check length and containing chars for a given description md5sum --- apt-pkg/deb/deblistparser.cc | 17 ++++++++++++----- debian/changelog | 4 +++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 00e2bd900..7bef6772c 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -215,15 +215,22 @@ string debListParser::DescriptionLanguage() */ MD5SumValue debListParser::Description_md5() { - string value = Section.FindS("Description-md5"); - - if (value.empty()) + string const value = Section.FindS("Description-md5"); + if (value.empty() == true) { MD5Summation md5; md5.Add((Description() + "\n").c_str()); return md5.Result(); - } else - return MD5SumValue(value); + } + else if (likely(value.size() == 32)) + { + if (likely(value.find_first_not_of("0123456789abcdefABCDEF") == string::npos)) + return MD5SumValue(value); + _error->Error("Malformed Description-md5 line; includes invalid character '%s'", value.c_str()); + return MD5SumValue(); + } + _error->Error("Malformed Description-md5 line; doesn't have the required length (32 != %d) '%s'", (int)value.size(), value.c_str()); + return MD5SumValue(); } /*}}}*/ // ListParser::UsePackage - Update a package structure /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 799653d5f..72830ad91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,10 @@ apt (0.9.3) unstable; urgency=low - use the correct library name the symbols header * apt-pkg/pkgcachegen.cc: - check if NewDescription allocation has failed and error out accordingly + * apt-pkg/deb/deblistparser.cc: + - check length and containing chars for a given description md5sum - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 21:59:02 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 22:28:32 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From 9a4ffe576267539ae5549f0c77cc8ab37c2516fb Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 2 May 2012 23:13:26 +0200 Subject: add a simple test for HashSumValue classes --- test/libapt/hashsums_test.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc index 396e4cf6b..e2d0aec5b 100644 --- a/test/libapt/hashsums_test.cc +++ b/test/libapt/hashsums_test.cc @@ -42,6 +42,28 @@ template <class T> void TestMill(const char *Out) int main(int argc, char** argv) { + // test HashSumValue which doesn't calculate but just stores sums + { + string md5sum = argv[2]; + MD5SumValue md5(md5sum); + equals(md5.Value(), md5sum); + } + { + string sha1sum = argv[3]; + SHA1SumValue sha1(sha1sum); + equals(sha1.Value(), sha1sum); + } + { + string sha2sum = argv[4]; + SHA256SumValue sha2(sha2sum); + equals(sha2.Value(), sha2sum); + } + { + string sha2sum = argv[5]; + SHA512SumValue sha2(sha2sum); + equals(sha2.Value(), sha2sum); + } + // From FIPS PUB 180-1 Test<SHA1Summation>("","da39a3ee5e6b4b0d3255bfef95601890afd80709"); Test<SHA1Summation>("abc","a9993e364706816aba3e25717850c26c9cd0d89d"); -- cgit v1.2.3 From 7f5aab82708813d86aab04029095988f40a8462e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 5 May 2012 02:06:49 +0200 Subject: check if we work on a valid description in IsDuplicateDescription as we end up working on dangling pointers otherwise which segfaults on s390x and ppc64 (Closes: #669427) --- apt-pkg/pkgcachegen.cc | 4 ++-- debian/changelog | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 5e0726f3b..d455e4070 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -286,7 +286,7 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator pkgCache::DescIterator Desc = Ver.DescriptionList(); // a version can only have one md5 describing it - if (MD5SumValue(Desc.md5()) != CurMd5) + if (Desc.end() == true || MD5SumValue(Desc.md5()) != CurMd5) continue; // don't add a new description if we have one for the given @@ -1459,7 +1459,7 @@ bool IsDuplicateDescription(pkgCache::DescIterator Desc, MD5SumValue const &CurMd5, std::string const &CurLang) { // Descriptions in the same link-list have all the same md5 - if (MD5SumValue(Desc.md5()) != CurMd5) + if (Desc.end() == true || MD5SumValue(Desc.md5()) != CurMd5) return false; for (; Desc.end() == false; ++Desc) if (Desc.LanguageCode() == CurLang) diff --git a/debian/changelog b/debian/changelog index 72830ad91..2c4bde370 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,10 +28,13 @@ apt (0.9.3) unstable; urgency=low - use the correct library name the symbols header * apt-pkg/pkgcachegen.cc: - check if NewDescription allocation has failed and error out accordingly + - check if we work on a valid description in IsDuplicateDescription as + we end up working on dangling pointers otherwise which segfaults on + s390x and ppc64 (Closes: #669427) * apt-pkg/deb/deblistparser.cc: - check length and containing chars for a given description md5sum - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 22:28:32 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 05 May 2012 02:02:41 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From a00a9b44a1e0abf944d88c36ceaac8afdd207dcb Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 5 May 2012 15:37:31 +0200 Subject: ensure that apti18n.h is included last as advertised (Closes: #671623) --- apt-pkg/cachefilter.cc | 4 ++-- apt-pkg/packagemanager.cc | 3 ++- cmdline/apt-extracttemplates.cc | 6 ++++-- cmdline/apt-internal-solver.cc | 7 ++++--- debian/changelog | 3 ++- ftparchive/cachedb.cc | 5 +++-- ftparchive/contents.cc | 4 +++- ftparchive/override.cc | 3 ++- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index 9ec3fa699..fb444208c 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -10,11 +10,11 @@ #include <apt-pkg/error.h> #include <apt-pkg/pkgcache.h> -#include <apti18n.h> - #include <string> #include <regex.h> + +#include <apti18n.h> /*}}}*/ namespace APT { namespace CacheFilter { diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index b56619ef5..06151a165 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -25,9 +25,10 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/sptr.h> -#include <apti18n.h> #include <iostream> #include <fcntl.h> + +#include <apti18n.h> /*}}}*/ using namespace std; diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 60efafba5..8fe15fdf9 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -36,11 +36,13 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> +#include <locale.h> + #include <fstream> -#include <locale.h> -#include <apti18n.h> #include "apt-extracttemplates.h" + +#include <apti18n.h> /*}}}*/ using namespace std; diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 25ecb7af1..e7faf88a9 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -7,6 +7,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <config.h> + #include <apt-pkg/error.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/init.h> @@ -18,11 +20,10 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/pkgsystem.h> -#include <config.h> -#include <apti18n.h> - #include <unistd.h> #include <cstdio> + +#include <apti18n.h> /*}}}*/ // ShowHelp - Show a help screen /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 2c4bde370..8eec902d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,8 +33,9 @@ apt (0.9.3) unstable; urgency=low s390x and ppc64 (Closes: #669427) * apt-pkg/deb/deblistparser.cc: - check length and containing chars for a given description md5sum + * ensure that apti18n.h is included last as advertised (Closes: #671623) - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 05 May 2012 02:02:41 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 05 May 2012 15:35:16 +0200 apt (0.9.2) unstable; urgency=low diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index a8b637a80..c2318bf53 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -19,11 +19,12 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> - + #include <netinet/in.h> // htonl, etc -#include <apti18n.h> #include "cachedb.h" + +#include <apti18n.h> /*}}}*/ // CacheDB::ReadyDB - Ready the DB2 /*{{{*/ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index bbc5a1e2b..015c790e0 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -38,13 +38,15 @@ #include <apt-pkg/debfile.h> #include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <malloc.h> -#include <apti18n.h> #include "contents.h" + +#include <apti18n.h> /*}}}*/ // GenContents::~GenContents - Free allocated memory /*{{{*/ diff --git a/ftparchive/override.cc b/ftparchive/override.cc index d363fd0fe..760c20120 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -12,13 +12,14 @@ // Include Files /*{{{*/ #include <config.h> -#include <apti18n.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <stdio.h> #include "override.h" + +#include <apti18n.h> /*}}}*/ // Override::ReadOverride - Read the override file /*{{{*/ -- cgit v1.2.3 From ee7af1bd58a717601fc30b5e7702d688749d2419 Mon Sep 17 00:00:00 2001 From: YOSHINO Yoshihito <yy.y.ja.jp@gmail.com> Date: Mon, 7 May 2012 21:16:25 +0200 Subject: * apt-pkg/acquire-worker.cc: - revert the use of FileFd::Write in OutFdReady as we don't want error reports about EAGAIN here as we retry later. Thanks to YOSHINO Yoshihito for the report. (Closes: #671721) --- apt-pkg/acquire-worker.cc | 13 ++++++++++--- debian/changelog | 6 +++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 8bc043c58..d6db8bc02 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -511,10 +511,17 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item) /* */ bool pkgAcquire::Worker::OutFdReady() { - if (FileFd::Write(OutFd,OutQueue.c_str(),OutQueue.length()) == false) + int Res; + do + { + Res = write(OutFd,OutQueue.c_str(),OutQueue.length()); + } + while (Res < 0 && errno == EINTR); + + if (Res <= 0) return MethodFailure(); - - OutQueue.clear(); + + OutQueue.erase(0,Res); if (OutQueue.empty() == true) OutReady = false; diff --git a/debian/changelog b/debian/changelog index 8eec902d0..ad3f5c894 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,8 +34,12 @@ apt (0.9.3) unstable; urgency=low * apt-pkg/deb/deblistparser.cc: - check length and containing chars for a given description md5sum * ensure that apti18n.h is included last as advertised (Closes: #671623) + * apt-pkg/acquire-worker.cc: + - revert the use of FileFd::Write in OutFdReady as we don't want error + reports about EAGAIN here as we retry later. Thanks to YOSHINO Yoshihito + for the report. (Closes: #671721) - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 05 May 2012 15:35:16 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3 From afb093cd9bc9d0b2abb6a87d1b98785183a6452d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 9 May 2012 19:16:39 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - check that the fd which are closed are valid --- apt-pkg/contrib/fileutl.cc | 10 +++++++--- debian/changelog | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index e9d1ba1ce..1cf225329 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1065,7 +1065,10 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C // We don't need the file open - instead let the compressor open it // as he properly knows better how to efficiently read from 'his' file if (FileName.empty() == false) + { close(iFd); + iFd = -1; + } } // Create a data pipe @@ -1133,7 +1136,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C close(Pipe[0]); else close(Pipe[1]); - if (Comp == true || FileName.empty() == true) + if ((Comp == true || FileName.empty() == true) && d->compressed_fd != -1) close(d->compressed_fd); return true; @@ -1355,8 +1358,9 @@ bool FileFd::Seek(unsigned long long To) if (d->bz2 != NULL) BZ2_bzclose(d->bz2); #endif - close(iFd); - iFd = 0; + if (iFd != -1) + close(iFd); + iFd = -1; if (TemporaryFileName.empty() == false) iFd = open(TemporaryFileName.c_str(), O_RDONLY); else if (FileName.empty() == false) diff --git a/debian/changelog b/debian/changelog index ad3f5c894..022eac529 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.3) unstable; urgency=low +apt (0.9.3) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/strutl.cc: @@ -38,6 +38,8 @@ apt (0.9.3) unstable; urgency=low - revert the use of FileFd::Write in OutFdReady as we don't want error reports about EAGAIN here as we retry later. Thanks to YOSHINO Yoshihito for the report. (Closes: #671721) + * apt-pkg/contrib/fileutl.cc: + - check that the fd which are closed are valid -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 -- cgit v1.2.3 From e29d7e3e1c7bcff54123b9a69f9b0136d4cf1de5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 9 May 2012 21:44:11 +0200 Subject: * apt-pkg/aptconfiguration.cc: - use NULL instead of "" for no (un)compress parameters --- apt-pkg/aptconfiguration.cc | 6 +++--- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index e1225b3e6..0fd470ed5 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -477,18 +477,18 @@ const Configuration::getCompressors(bool const Cached) { setDefaultConfigurationForCompressors(); - compressors.push_back(Compressor(".", "", "", "", "", 1)); + compressors.push_back(Compressor(".", "", "", NULL, NULL, 1)); if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true) compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2)); #ifdef HAVE_ZLIB else - compressors.push_back(Compressor("gzip",".gz","false", "", "", 2)); + compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2)); #endif if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true) compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3)); #ifdef HAVE_BZ2 else - compressors.push_back(Compressor("bzip2",".bz2","false", "", "", 3)); + compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 3)); #endif if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true) compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4)); diff --git a/debian/changelog b/debian/changelog index 022eac529..b0c74ea31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ apt (0.9.3) UNRELEASED; urgency=low for the report. (Closes: #671721) * apt-pkg/contrib/fileutl.cc: - check that the fd which are closed are valid + * apt-pkg/aptconfiguration.cc: + - use NULL instead of "" for no (un)compress parameters -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 -- cgit v1.2.3 From ba667cf74b94846c0696ae7a27e53b28492554b6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 9 May 2012 22:05:18 +0200 Subject: ensure that we do init d only once and especially not with its own content as this causes some "interesting" hickups resulting in segfaults as it seems (Closes: #554387, #670979) --- apt-pkg/contrib/fileutl.cc | 11 ++++++----- debian/changelog | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 1cf225329..14c0b561f 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -905,8 +905,6 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms) { Close(); - d = new FileFdPrivate; - d->openmode = Mode; Flags = AutoClose; if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0) @@ -1000,8 +998,6 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose) { Close(); - d = new FileFdPrivate; - d->openmode = Mode; Flags = (AutoClose) ? FileFd::AutoClose : 0; iFd = Fd; this->FileName = ""; @@ -1015,7 +1011,12 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: } bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor) { - d->compressor = compressor; + if (d == NULL) + { + d = new FileFdPrivate(); + d->openmode = Mode; + d->compressor = compressor; + } if (compressor.Name == "." || compressor.Binary.empty() == true) return true; #ifdef HAVE_ZLIB diff --git a/debian/changelog b/debian/changelog index b0c74ea31..6b9ba6769 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,9 @@ apt (0.9.3) UNRELEASED; urgency=low for the report. (Closes: #671721) * apt-pkg/contrib/fileutl.cc: - check that the fd which are closed are valid + - ensure that we do init d only once and especially not with its own + content as this causes some "interesting" hickups resulting in segfaults + as it seems (Closes: #554387, #670979) * apt-pkg/aptconfiguration.cc: - use NULL instead of "" for no (un)compress parameters -- cgit v1.2.3 From adbd7eb4db58ce38965bf6340b8b059a07fdb5bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 00:14:50 +0200 Subject: collect zombie (de)compressor processes on reopen --- apt-pkg/contrib/fileutl.cc | 15 ++++++++++++++- debian/changelog | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 14c0b561f..4dc087983 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1022,6 +1022,11 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C #ifdef HAVE_ZLIB else if (compressor.Name == "gzip") { + if (d->gz != NULL) + { + gzclose(d->gz); + d->gz = NULL; + } if ((Mode & ReadWrite) == ReadWrite) d->gz = gzdopen(iFd, "r+"); else if ((Mode & WriteOnly) == WriteOnly) @@ -1037,6 +1042,11 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C #ifdef HAVE_BZ2 else if (compressor.Name == "bzip2") { + if (d->bz2 != NULL) + { + BZ2_bzclose(d->bz2); + d->bz2 = NULL; + } if ((Mode & ReadWrite) == ReadWrite) d->bz2 = BZ2_bzdopen(iFd, "r+"); else if ((Mode & WriteOnly) == WriteOnly) @@ -1050,14 +1060,17 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C } #endif + // collect zombies here in case we reopen + if (d->compressor_pid > 0) + ExecWait(d->compressor_pid, "FileFdCompressor", true); if ((Mode & ReadWrite) == ReadWrite) return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str()); bool const Comp = (Mode & WriteOnly) == WriteOnly; - // Handle 'decompression' of empty files if (Comp == false) { + // Handle 'decompression' of empty files struct stat Buf; fstat(iFd, &Buf); if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false) diff --git a/debian/changelog b/debian/changelog index 6b9ba6769..8b052e234 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ apt (0.9.3) UNRELEASED; urgency=low - ensure that we do init d only once and especially not with its own content as this causes some "interesting" hickups resulting in segfaults as it seems (Closes: #554387, #670979) + - collect zombie (de)compressor processes on reopen * apt-pkg/aptconfiguration.cc: - use NULL instead of "" for no (un)compress parameters -- cgit v1.2.3 From 4ac4a98e16e1ecd34928f6d93389b7106c93c65e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 00:15:52 +0200 Subject: we don't need zlib (anymore) in rred so don't include it --- methods/rred.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/methods/rred.cc b/methods/rred.cc index 78d1595d4..7c65f8f92 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -15,7 +15,6 @@ #include <utime.h> #include <stdio.h> #include <errno.h> -#include <zlib.h> #include <apti18n.h> /*}}}*/ /** \brief RredMethod - ed-style incremential patch method {{{ -- cgit v1.2.3 From fbb89d946da063ec6e1c4b0034cb479c10a37375 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 01:54:21 +0200 Subject: ensure that in error conditions the Fail flag is set --- apt-pkg/contrib/fileutl.cc | 49 +++++++++++++++++++++++++++++++++++++++++++--- debian/changelog | 1 + 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 4dc087983..7a24b6bb0 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1065,7 +1065,10 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C ExecWait(d->compressor_pid, "FileFdCompressor", true); if ((Mode & ReadWrite) == ReadWrite) + { + Flags |= Fail; return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str()); + } bool const Comp = (Mode & WriteOnly) == WriteOnly; if (Comp == false) @@ -1088,7 +1091,10 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C // Create a data pipe int Pipe[2] = {-1,-1}; if (pipe(Pipe) != 0) + { + Flags |= Fail; return _error->Errno("pipe",_("Failed to create subprocess IPC")); + } for (int J = 0; J != 2; J++) SetCloseExec(Pipe[J],true); @@ -1367,7 +1373,10 @@ bool FileFd::Seek(unsigned long long To) return Skip(To - seekpos); if ((d->openmode & ReadOnly) != ReadOnly) + { + Flags |= Fail; return _error->Error("Reopen is only implemented for read-only files!"); + } #ifdef HAVE_BZ2 if (d->bz2 != NULL) BZ2_bzclose(d->bz2); @@ -1385,11 +1394,17 @@ bool FileFd::Seek(unsigned long long To) if (lseek(d->compressed_fd, 0, SEEK_SET) != 0) iFd = d->compressed_fd; if (iFd <= 0) + { + Flags |= Fail; return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); + } } if (OpenInternDescriptor(d->openmode, d->compressor) == false) + { + Flags |= Fail; return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str()); + } if (To != 0) return Skip(To); @@ -1431,7 +1446,10 @@ bool FileFd::Skip(unsigned long long Over) { unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over); if (Read(buffer, toread) == false) + { + Flags |= Fail; return _error->Error("Unable to seek ahead %llu",Over); + } Over -= toread; } return true; @@ -1499,7 +1517,10 @@ unsigned long long FileFd::Tell() #endif Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) + { + Flags |= Fail; _error->Errno("lseek","Failed to determine the current file position"); + } d->seekpos = Res; return Res; } @@ -1511,7 +1532,10 @@ unsigned long long FileFd::FileSize() { struct stat Buf; if (d->pipe == false && fstat(iFd,&Buf) != 0) + { + Flags |= Fail; return _error->Errno("fstat","Unable to determine the file size"); + } // for compressor pipes st_size is undefined and at 'best' zero if (d->pipe == true || S_ISFIFO(Buf.st_mode)) @@ -1520,7 +1544,10 @@ unsigned long long FileFd::FileSize() // in theory the Open-methods should take care of it already d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) + { + Flags |= Fail; return _error->Errno("stat","Unable to determine the file size"); + } } return Buf.st_size; @@ -1562,10 +1589,16 @@ unsigned long long FileFd::Size() * bits of the file */ // FIXME: Size for gz-files is limited by 32bit… no largefile support if (lseek(iFd, -4, SEEK_END) < 0) - return _error->Errno("lseek","Unable to seek to end of gzipped file"); + { + Flags |= Fail; + return _error->Errno("lseek","Unable to seek to end of gzipped file"); + } size = 0L; if (read(iFd, &size, 4) != 4) - return _error->Errno("read","Unable to read original size of gzipped file"); + { + Flags |= Fail; + return _error->Errno("read","Unable to read original size of gzipped file"); + } #ifdef WORDS_BIGENDIAN uint32_t tmp_size = size; @@ -1575,7 +1608,10 @@ unsigned long long FileFd::Size() #endif if (lseek(iFd, oldPos, SEEK_SET) < 0) - return _error->Errno("lseek","Unable to seek in gzipped file"); + { + Flags |= Fail; + return _error->Errno("lseek","Unable to seek in gzipped file"); + } return size; } @@ -1592,6 +1628,7 @@ time_t FileFd::ModificationTime() struct stat Buf; if (d->pipe == false && fstat(iFd,&Buf) != 0) { + Flags |= Fail; _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } @@ -1604,6 +1641,7 @@ time_t FileFd::ModificationTime() d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) { + Flags |= Fail; _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } @@ -1663,6 +1701,8 @@ bool FileFd::Close() d = NULL; } + if (Res == false) + Flags |= Fail; return Res; } /*}}}*/ @@ -1673,7 +1713,10 @@ bool FileFd::Sync() { #ifdef _POSIX_SYNCHRONIZED_IO if (fsync(iFd) != 0) + { + Flags |= Fail; return _error->Errno("sync",_("Problem syncing the file")); + } #endif return true; } diff --git a/debian/changelog b/debian/changelog index 8b052e234..1874d54b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,7 @@ apt (0.9.3) UNRELEASED; urgency=low content as this causes some "interesting" hickups resulting in segfaults as it seems (Closes: #554387, #670979) - collect zombie (de)compressor processes on reopen + - ensure that in error conditions the Fail flag is set * apt-pkg/aptconfiguration.cc: - use NULL instead of "" for no (un)compress parameters -- cgit v1.2.3 From f0e835998f21c315c5154da4e7f5c51b18929b3a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 01:54:32 +0200 Subject: fix calling style of FileFd (no functional change) --- apt-pkg/deb/debindexfile.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 5dc2a2ac2..76c740341 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -161,7 +161,7 @@ unsigned long debSourcesIndex::Size() const /* we need to ignore errors here; if the lists are absent, just return 0 */ _error->PushToStack(); - FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnly, FileFd::Extension); + FileFd f(IndexFile("Sources"), FileFd::ReadOnly, FileFd::Extension); if (!f.Failed()) size = f.Size(); @@ -290,7 +290,7 @@ unsigned long debPackagesIndex::Size() const /* we need to ignore errors here; if the lists are absent, just return 0 */ _error->PushToStack(); - FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnly, FileFd::Extension); + FileFd f(IndexFile("Packages"), FileFd::ReadOnly, FileFd::Extension); if (!f.Failed()) size = f.Size(); @@ -488,7 +488,7 @@ unsigned long debTranslationsIndex::Size() const /* we need to ignore errors here; if the lists are absent, just return 0 */ _error->PushToStack(); - FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnly, FileFd::Extension); + FileFd f(IndexFile(Language), FileFd::ReadOnly, FileFd::Extension); if (!f.Failed()) size = f.Size(); -- cgit v1.2.3 From ff477ee133fb448622cc86f658f1a9b23577e413 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 03:09:18 +0200 Subject: ensure that d is set before accessing it --- apt-pkg/contrib/fileutl.cc | 91 +++++++++++++++++++++++++--------------------- debian/changelog | 1 + 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 7a24b6bb0..c8e685a5a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1011,16 +1011,18 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: } bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor) { + if (compressor.Name == "." || compressor.Binary.empty() == true) + return true; + if (d == NULL) { d = new FileFdPrivate(); d->openmode = Mode; d->compressor = compressor; } - if (compressor.Name == "." || compressor.Binary.empty() == true) - return true; + #ifdef HAVE_ZLIB - else if (compressor.Name == "gzip") + if (compressor.Name == "gzip") { if (d->gz != NULL) { @@ -1040,7 +1042,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C } #endif #ifdef HAVE_BZ2 - else if (compressor.Name == "bzip2") + if (compressor.Name == "bzip2") { if (d->bz2 != NULL) { @@ -1185,12 +1187,12 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) do { #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) Res = gzread(d->gz,To,Size); else #endif #ifdef HAVE_BZ2 - if (d->bz2 != NULL) + if (d != NULL && d->bz2 != NULL) Res = BZ2_bzread(d->bz2,To,Size); else #endif @@ -1202,7 +1204,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) continue; Flags |= Fail; #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); @@ -1211,7 +1213,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) } #endif #ifdef HAVE_BZ2 - if (d->bz2 != NULL) + if (d != NULL && d->bz2 != NULL) { int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); @@ -1224,7 +1226,8 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) To = (char *)To + Res; Size -= Res; - d->seekpos += Res; + if (d != NULL) + d->seekpos += Res; if (Actual != 0) *Actual += Res; } @@ -1252,7 +1255,7 @@ char* FileFd::ReadLine(char *To, unsigned long long const Size) { *To = '\0'; #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) return gzgets(d->gz, To, Size); #endif @@ -1283,12 +1286,12 @@ bool FileFd::Write(const void *From,unsigned long long Size) do { #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) Res = gzwrite(d->gz,From,Size); else #endif #ifdef HAVE_BZ2 - if (d->bz2 != NULL) + if (d != NULL && d->bz2 != NULL) Res = BZ2_bzwrite(d->bz2,(void*)From,Size); else #endif @@ -1299,7 +1302,7 @@ bool FileFd::Write(const void *From,unsigned long long Size) { Flags |= Fail; #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); @@ -1308,7 +1311,7 @@ bool FileFd::Write(const void *From,unsigned long long Size) } #endif #ifdef HAVE_BZ2 - if (d->bz2 != NULL) + if (d != NULL && d->bz2 != NULL) { int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); @@ -1321,7 +1324,8 @@ bool FileFd::Write(const void *From,unsigned long long Size) From = (char *)From + Res; Size -= Res; - d->seekpos += Res; + if (d != NULL) + d->seekpos += Res; } while (Res > 0 && Size > 0); @@ -1359,11 +1363,11 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size) /* */ bool FileFd::Seek(unsigned long long To) { - if (d->pipe == true + if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 - || d->bz2 != NULL + || d->bz2 != NULL #endif - ) + )) { // Our poor man seeking in pipes is costly, so try to avoid it unsigned long long seekpos = Tell(); @@ -1414,7 +1418,7 @@ bool FileFd::Seek(unsigned long long To) } int res; #ifdef HAVE_ZLIB - if (d->gz) + if (d != NULL && d->gz) res = gzseek(d->gz,To,SEEK_SET); else #endif @@ -1425,7 +1429,8 @@ bool FileFd::Seek(unsigned long long To) return _error->Error("Unable to seek to %llu", To); } - d->seekpos = To; + if (d != NULL) + d->seekpos = To; return true; } /*}}}*/ @@ -1434,11 +1439,11 @@ bool FileFd::Seek(unsigned long long To) /* */ bool FileFd::Skip(unsigned long long Over) { - if (d->pipe == true + if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 - || d->bz2 != NULL + || d->bz2 != NULL #endif - ) + )) { d->seekpos += Over; char buffer[1024]; @@ -1457,7 +1462,7 @@ bool FileFd::Skip(unsigned long long Over) int res; #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) res = gzseek(d->gz,Over,SEEK_CUR); else #endif @@ -1467,7 +1472,8 @@ bool FileFd::Skip(unsigned long long Over) Flags |= Fail; return _error->Error("Unable to seek ahead %llu",Over); } - d->seekpos = res; + if (d != NULL) + d->seekpos = res; return true; } @@ -1478,7 +1484,7 @@ bool FileFd::Skip(unsigned long long Over) bool FileFd::Truncate(unsigned long long To) { #if defined HAVE_ZLIB || defined HAVE_BZ2 - if (d->gz != NULL || d->bz2 != NULL) + if (d != NULL && (d->gz != NULL || d->bz2 != NULL)) { Flags |= Fail; return _error->Error("Truncating compressed files is not implemented (%s)", FileName.c_str()); @@ -1502,16 +1508,16 @@ unsigned long long FileFd::Tell() // seeking around, but not all users of FileFd use always Seek() and co // so d->seekpos isn't always true and we can just use it as a hint if // we have nothing else, but not always as an authority… - if (d->pipe == true + if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 - || d->bz2 != NULL + || d->bz2 != NULL #endif - ) + )) return d->seekpos; off_t Res; #ifdef HAVE_ZLIB - if (d->gz != NULL) + if (d != NULL && d->gz != NULL) Res = gztell(d->gz); else #endif @@ -1521,7 +1527,8 @@ unsigned long long FileFd::Tell() Flags |= Fail; _error->Errno("lseek","Failed to determine the current file position"); } - d->seekpos = Res; + if (d != NULL) + d->seekpos = Res; return Res; } /*}}}*/ @@ -1531,18 +1538,19 @@ unsigned long long FileFd::Tell() unsigned long long FileFd::FileSize() { struct stat Buf; - if (d->pipe == false && fstat(iFd,&Buf) != 0) + if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) { Flags |= Fail; return _error->Errno("fstat","Unable to determine the file size"); } // for compressor pipes st_size is undefined and at 'best' zero - if (d->pipe == true || S_ISFIFO(Buf.st_mode)) + if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) { // we set it here, too, as we get the info here for free // in theory the Open-methods should take care of it already - d->pipe = true; + if (d != NULL) + d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) { Flags |= Fail; @@ -1562,11 +1570,11 @@ unsigned long long FileFd::Size() // for compressor pipes st_size is undefined and at 'best' zero, // so we 'read' the content and 'seek' back - see there - if (d->pipe == true + if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 - || (d->bz2 && size > 0) + || (d->bz2 && size > 0) #endif - ) + )) { unsigned long long const oldSeek = Tell(); char ignore[1000]; @@ -1581,7 +1589,7 @@ unsigned long long FileFd::Size() // only check gzsize if we are actually a gzip file, just checking for // "gz" is not sufficient as uncompressed files could be opened with // gzopen in "direct" mode as well - else if (d->gz && !gzdirect(d->gz) && size > 0) + else if (d != NULL && d->gz && !gzdirect(d->gz) && size > 0) { off_t const oldPos = lseek(iFd,0,SEEK_CUR); /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do @@ -1626,7 +1634,7 @@ unsigned long long FileFd::Size() time_t FileFd::ModificationTime() { struct stat Buf; - if (d->pipe == false && fstat(iFd,&Buf) != 0) + if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) { Flags |= Fail; _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); @@ -1634,11 +1642,12 @@ time_t FileFd::ModificationTime() } // for compressor pipes st_size is undefined and at 'best' zero - if (d->pipe == true || S_ISFIFO(Buf.st_mode)) + if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) { // we set it here, too, as we get the info here for free // in theory the Open-methods should take care of it already - d->pipe = true; + if (d != NULL) + d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) { Flags |= Fail; diff --git a/debian/changelog b/debian/changelog index 1874d54b2..040ca9544 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ apt (0.9.3) UNRELEASED; urgency=low as it seems (Closes: #554387, #670979) - collect zombie (de)compressor processes on reopen - ensure that in error conditions the Fail flag is set + - ensure that d is set before accessing it * apt-pkg/aptconfiguration.cc: - use NULL instead of "" for no (un)compress parameters -- cgit v1.2.3 From 3fa950f16cb2997bccd97475f75c5f3e37609dd3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 18:47:51 +0200 Subject: add a small wrapper to call gdb in the framework setting --- test/integration/framework | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/framework b/test/integration/framework index b80b02922..5a0e1070f 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -107,6 +107,10 @@ aptitude() { LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which aptitude) $* fi } +gdb() { + echo "gdb: run »$*«" + APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1 +} addtrap() { CURRENTTRAP="$CURRENTTRAP $1" -- cgit v1.2.3 From db09a1c5dd74f422571c4130364bb7c78200e8c8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 20:40:47 +0200 Subject: * apt-pkg/algorithms.cc: - factor out of ListUpdate a AcquireUpdate to be able to provide your own pkgAcquire fetcher to the wrapper --- apt-pkg/algorithms.cc | 37 ++++++++++++++++++++++++++----------- apt-pkg/algorithms.h | 4 +++- debian/changelog | 3 +++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 8beb2d51c..e7b359981 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1453,7 +1453,7 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List) qsort(List,Count,sizeof(*List),PrioComp); } /*}}}*/ -// ListUpdate - update the cache files /*{{{*/ +// ListUpdate - construct Fetcher and update the cache files /*{{{*/ // --------------------------------------------------------------------- /* This is a simple wrapper to update the cache. it will fetch stuff * from the network (or any other sources defined in sources.list) @@ -1462,7 +1462,6 @@ bool ListUpdate(pkgAcquireStatus &Stat, pkgSourceList &List, int PulseInterval) { - pkgAcquire::RunResult res; pkgAcquire Fetcher; if (Fetcher.Setup(&Stat, _config->FindDir("Dir::State::Lists")) == false) return false; @@ -1471,11 +1470,24 @@ bool ListUpdate(pkgAcquireStatus &Stat, if (List.GetIndexes(&Fetcher) == false) return false; + return AcquireUpdate(Fetcher, PulseInterval, true); +} + /*}}}*/ +// AcquireUpdate - take Fetcher and update the cache files /*{{{*/ +// --------------------------------------------------------------------- +/* This is a simple wrapper to update the cache with a provided acquire + * If you only need control over Status and the used SourcesList use + * ListUpdate method instead. + */ +bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval, + bool const RunUpdateScripts, bool const ListCleanup) +{ // Run scripts - RunScripts("APT::Update::Pre-Invoke"); - - // check arguments - if(PulseInterval>0) + if (RunUpdateScripts == true) + RunScripts("APT::Update::Pre-Invoke"); + + pkgAcquire::RunResult res; + if(PulseInterval > 0) res = Fetcher.Run(PulseInterval); else res = Fetcher.Run(); @@ -1512,7 +1524,7 @@ bool ListUpdate(pkgAcquireStatus &Stat, // Clean out any old list files // Keep "APT::Get::List-Cleanup" name for compatibility, but // this is really a global option for the APT library now - if (!TransientNetworkFailure && !Failed && + if (!TransientNetworkFailure && !Failed && ListCleanup == true && (_config->FindB("APT::Get::List-Cleanup",true) == true && _config->FindB("APT::List-Cleanup",true) == true)) { @@ -1529,11 +1541,14 @@ bool ListUpdate(pkgAcquireStatus &Stat, // Run the success scripts if all was fine - if(!TransientNetworkFailure && !Failed) - RunScripts("APT::Update::Post-Invoke-Success"); + if (RunUpdateScripts == true) + { + if(!TransientNetworkFailure && !Failed) + RunScripts("APT::Update::Post-Invoke-Success"); - // Run the other scripts - RunScripts("APT::Update::Post-Invoke"); + // Run the other scripts + RunScripts("APT::Update::Post-Invoke"); + } return true; } /*}}}*/ diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 37eacf1f8..076542c20 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -147,5 +147,7 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache); void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List); bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0); - +bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0, + bool const RunUpdateScripts = true, bool const ListCleanup = true); + #endif diff --git a/debian/changelog b/debian/changelog index 040ca9544..7b1ed46ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,9 @@ apt (0.9.3) UNRELEASED; urgency=low - ensure that d is set before accessing it * apt-pkg/aptconfiguration.cc: - use NULL instead of "" for no (un)compress parameters + * apt-pkg/algorithms.cc: + - factor out of ListUpdate a AcquireUpdate to be able to provide your + own pkgAcquire fetcher to the wrapper -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 -- cgit v1.2.3 From 4e1c86a6c0cf9a6e51ec4f9b9ad9271547fa036d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 10 May 2012 20:41:00 +0200 Subject: * apt-inst/deb/debfile.h: - readd 'md5.h' to the uncleaned header includes to make qapt build against us again unchanged to unblock transition (Closes: #669163) --- apt-inst/deb/debfile.h | 4 ++++ debian/changelog | 3 +++ 2 files changed, 7 insertions(+) diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index d94b74446..38211fb0f 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -29,6 +29,10 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/pkgcache.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/md5.h> +#endif + class FileFd; class debDebFile diff --git a/debian/changelog b/debian/changelog index 7b1ed46ac..3e36f0fa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,9 @@ apt (0.9.3) UNRELEASED; urgency=low * apt-pkg/algorithms.cc: - factor out of ListUpdate a AcquireUpdate to be able to provide your own pkgAcquire fetcher to the wrapper + * apt-inst/deb/debfile.h: + - readd 'md5.h' to the uncleaned header includes to make qapt build + against us again unchanged to unblock transition (Closes: #669163) -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 -- cgit v1.2.3 From 5ca28ebd7445774963d59b35f83c649e1ff61ca0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 May 2012 06:49:19 +0200 Subject: add a manually runable library action to help in maintaining the symbols files --- prepare-release | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/prepare-release b/prepare-release index fd98c489f..821726ae2 100755 --- a/prepare-release +++ b/prepare-release @@ -3,6 +3,9 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') +LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" +LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" + if [ "$1" = 'pre-export' ]; then libraryversioncheck() { LIBRARY="$1" @@ -17,8 +20,8 @@ if [ "$1" = 'pre-export' ]; then fi } - libraryversioncheck 'libapt-pkg' "$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" - libraryversioncheck 'libapt-inst' "$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" + libraryversioncheck 'libapt-pkg' "$LIBAPTPKGVERSION" + libraryversioncheck 'libapt-inst' "$LIBAPTINSTVERSION" if [ "$DISTRIBUTION" = 'sid' ]; then @@ -43,12 +46,32 @@ elif [ "$1" = 'post-build' ]; then else echo >&2 'REMEMBER: Change to a valid distribution before release' fi +elif [ "$1" = 'library' ]; then + librarysymbols() { + echo "Checking $1 in version $2" + tmpfile=$(mktemp) + dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile + echo '=== Missing symbols:' + grep '^+#MISSING' $tmpfile + echo '=== New symbols:' + grep '^+ ' $tmpfile | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do + echo " (c++)\"${line}@Base\" $VERSION" + done | sort -u + rm $tmpfile + } + librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}" + echo + librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}" else echo >&1 "Usage:\t$0 pre-export \t$0 post-build +\t$0 library If you use »bzr builddeb« you can leave this script alone as it will be run at the right places auto-magically. Otherwise you should use »pre-export« to update po and pot files as well as version numbering. -»post-build« can be used to run some more or less useful checks later on." +»post-build« can be used to run some more or less useful checks later on. + +»library« isn't run automatically but can be useful for maintaining the +(more or less experimental) symbols files we provide" fi -- cgit v1.2.3 From aa2218b25cb29e8c0677f0f3ede098583c7ae49f Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Fri, 11 May 2012 19:08:14 +0200 Subject: releasing version 0.9.3 --- configure.in | 2 +- debian/changelog | 4 ++-- doc/po/apt-doc.pot | 41 +++++++++++++++++++++++++++++++++++------ doc/po/de.po | 43 +++++++++++++++++++++++++++++++++++++------ doc/po/es.po | 46 +++++++++++++++++++++++++++++++++++++--------- doc/po/fr.po | 46 +++++++++++++++++++++++++++++++++++++--------- doc/po/it.po | 41 +++++++++++++++++++++++++++++++++++------ doc/po/ja.po | 46 +++++++++++++++++++++++++++++++++++++--------- doc/po/pl.po | 46 +++++++++++++++++++++++++++++++++++++--------- doc/po/pt.po | 46 +++++++++++++++++++++++++++++++++++++--------- doc/po/pt_BR.po | 41 +++++++++++++++++++++++++++++++++++------ 11 files changed, 330 insertions(+), 72 deletions(-) diff --git a/configure.in b/configure.in index e993c7f4e..592c7dcb0 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.2" +PACKAGE_VERSION="1.5" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 3e36f0fa8..ba660b726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.3) UNRELEASED; urgency=low +apt (0.9.3) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/strutl.cc: @@ -55,7 +55,7 @@ apt (0.9.3) UNRELEASED; urgency=low - readd 'md5.h' to the uncleaned header includes to make qapt build against us again unchanged to unblock transition (Closes: #669163) - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 + -- Michael Vogt <mvo@debian.org> Fri, 11 May 2012 17:16:22 +0200 apt (0.9.2) unstable; urgency=low diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index fee898f3c..fe4f6b497 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-04-20 14:20+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+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" @@ -1256,7 +1256,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "" @@ -1271,7 +1271,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255 msgid "See Also" msgstr "" @@ -1281,7 +1281,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" @@ -1568,13 +1568,42 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +msgid "<option>--empty</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use " +"--no-empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f " +""%v";%n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." diff --git a/doc/po/de.po b/doc/po/de.po index 5d65eea0c..040baac57 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.8.15-9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+0300\n" "PO-Revision-Date: 2011-11-13 11:21+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1605,7 +1605,7 @@ msgstr "" "<literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1623,7 +1623,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1637,7 +1637,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -1998,14 +1998,45 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +#, fuzzy +#| msgid "<option>-y</option>" +msgid "<option>--empty</option>" +msgstr "<option>-y</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." diff --git a/doc/po/es.po b/doc/po/es.po index 5e554b70d..542926fbf 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+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" @@ -1651,7 +1651,7 @@ msgstr "" "Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1669,7 +1669,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1683,7 +1683,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -2047,14 +2047,45 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +#, fuzzy +#| msgid "<option>--help</option>" +msgid "<option>--empty</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -11651,9 +11682,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos." #~ msgid "<option>-h</option>" #~ msgstr "<option>-h</option>" -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - #~ msgid "Show a short usage summary." #~ msgstr "Muestra un breve resumen de uso." diff --git a/doc/po/fr.po b/doc/po/fr.po index 09c902135..e57b45907 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+0300\n" "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1605,7 +1605,7 @@ msgstr "" "Élément de configuration : <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1623,7 +1623,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1637,7 +1637,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -2001,14 +2001,45 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +#, fuzzy +#| msgid "<option>--help</option>" +msgid "<option>--empty</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -11627,9 +11658,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque." #~ msgid "<option>-h</option>" #~ msgstr "<option>-h</option>" -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - #~ msgid "Show a short usage summary." #~ msgstr "Affiche un résumé de l'aide" diff --git a/doc/po/it.po b/doc/po/it.po index 1e2342f7b..558999e96 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+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" @@ -1226,7 +1226,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1244,7 +1244,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1258,7 +1258,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -1548,14 +1548,43 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +msgid "<option>--empty</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." diff --git a/doc/po/ja.po b/doc/po/ja.po index 6c896981d..dce950e93 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+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" @@ -1654,7 +1654,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1674,7 +1674,7 @@ msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1690,7 +1690,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -2071,16 +2071,47 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "設定箇所の内容を表示するだけです。" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +#, fuzzy +#| msgid "<option>--help</option>" +msgid "<option>--empty</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -11252,9 +11283,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する #~ msgid "<option>-h</option>" #~ msgstr "<option>-h</option>" -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #~ msgid "Show a short usage summary." #~ msgstr "短い使用方法を表示します。" diff --git a/doc/po/pl.po b/doc/po/pl.po index c8140963b..54d5265db 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+0300\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -1687,7 +1687,7 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1705,7 +1705,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1720,7 +1720,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -2104,15 +2104,46 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "Wyświetla zawartość przestrzeni konfiguracji." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +#, fuzzy +#| msgid "<option>--help</option>" +msgid "<option>--empty</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" # #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -10518,9 +10549,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku." #~ msgid "<option>-h</option>" #~ msgstr "<option>-h</option>" -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - # #~ msgid "Show a short usage summary." #~ msgstr "Wyświetla krótkie informacje na temat użytkowania." diff --git a/doc/po/pt.po b/doc/po/pt.po index 7759b2503..84ebf0735 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+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" @@ -1602,7 +1602,7 @@ msgstr "" "<literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1620,7 +1620,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1634,7 +1634,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -1994,14 +1994,45 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "Apenas mostra o conteúdo do espaço de configuração." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +#, fuzzy +#| msgid "<option>--help</option>" +msgid "<option>--empty</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -11529,9 +11560,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." #~ msgid "<option>-h</option>" #~ msgstr "<option>-h</option>" -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - #~ msgid "Show a short usage summary." #~ msgstr "Mostra um curto sumário de utilização." diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 97aa49c33..3ada38fca 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2012-04-17 09:28+0300\n" +"POT-Creation-Date: 2012-05-11 17:16+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" @@ -1279,7 +1279,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 +#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" @@ -1297,7 +1297,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 +#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 @@ -1312,7 +1312,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 +#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@ -1603,8 +1603,37 @@ msgstr "" msgid "Just show the contents of the configuration space." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:89 +msgid "<option>--empty</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:90 +msgid "" +"Include options which have an empty value. This is the default, so use --no-" +"empty to remove them from the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:95 +msgid "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:96 +msgid "" +"Defines the output of each config option. %t will be replaced with " +"the tagname, %f with the complete tagname and %v with the " +"value of the option. Use uppercase letters and the respective values will " +"be quoted. Additionally %n will be replaced by a newline, %N " +"by a tab. A % can be printed by using %%." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 #, fuzzy msgid "&apt-conf;" @@ -1614,7 +1643,7 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:100 +#: apt-config.8.xml:114 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." -- cgit v1.2.3 From 606837654922b8c58c9ac8a12b44c30f308115e3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 May 2012 00:11:07 +0200 Subject: * apt-pkg/pkgcachegen.cc: - make IsDuplicatedDescription static so that it is really private as we don't need a symbol for it as it is not in a header --- apt-pkg/pkgcachegen.cc | 4 ++-- debian/changelog | 9 +++++++++ debian/libapt-pkg4.12.symbols | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d455e4070..538d10b35 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -38,7 +38,7 @@ typedef std::vector<pkgIndexFile *>::iterator FileIterator; template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap; -bool IsDuplicateDescription(pkgCache::DescIterator Desc, +static bool IsDuplicateDescription(pkgCache::DescIterator Desc, MD5SumValue const &CurMd5, std::string const &CurLang); using std::string; @@ -1455,7 +1455,7 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O } /*}}}*/ // IsDuplicateDescription /*{{{*/ -bool IsDuplicateDescription(pkgCache::DescIterator Desc, +static bool IsDuplicateDescription(pkgCache::DescIterator Desc, MD5SumValue const &CurMd5, std::string const &CurLang) { // Descriptions in the same link-list have all the same md5 diff --git a/debian/changelog b/debian/changelog index ba660b726..af63bec4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.4) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - make IsDuplicatedDescription static so that it is really private + as we don't need a symbol for it as it is not in a header + + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 + apt (0.9.3) unstable; urgency=low [ David Kalnischkies ] diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 1abf22899..bf42e8b10 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1530,4 +1530,3 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 - (c++|optional=internal)"IsDuplicateDescription(pkgCache::DescIterator, HashSumValue<128> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp7 -- cgit v1.2.3 From 742f57054fe787714c9ab59aa704cdcec25f3b28 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 May 2012 00:36:44 +0200 Subject: * Makefile, buildlib/*.mak: - reshuffle dependencies so that parallel building seems to work --- Makefile | 9 ++++++--- buildlib/configure.mak | 11 +++++------ buildlib/copy.mak | 2 +- buildlib/podomain.mak | 6 +++--- debian/changelog | 2 ++ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index aa8160ac0..a35ad1d37 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ endif default: startup all .PHONY: headers library clean veryclean all binary program doc test update-po -startup all headers library clean veryclean binary program doc dirs test update-po: +all headers library clean veryclean binary program doc test update-po startup dirs: $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ @@ -21,11 +21,14 @@ startup all headers library clean veryclean binary program doc dirs test update- $(MAKE) -C po $@ $(MAKE) -C test $@ -update-po: startup +all headers library clean veryclean binary program doc test update-po: startup dirs + +dirs: startup # Some very common aliases -.PHONY: maintainer-clean dist-clean distclean pristine sanity +.PHONY: maintainer-clean dist-clean distclean pristine sanity maintainer-clean dist-clean distclean pristine sanity: veryclean +veryclean: clean # The startup target builds the necessary configure scripts. It should # be used after a CVS checkout. diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 310c2600c..c0d8e3c76 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE buildlib/config.sub: ln -sf /usr/share/misc/config.sub buildlib/config.sub buildlib/config.guess: - ln -sf /usr/share/misc/config.guess buildlib/config.guess + ln -sf /usr/share/misc/config.guess buildlib/config.guess configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub autoconf aclocal.m4: $(wildcard buildlib/*.m4) aclocal -I buildlib - + $(BUILDDIR)/config.status: configure - /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) + /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure) - -$(addprefix $(BUILDDIR)/,$(CONVERTED)): - (cd $(BUILDDIR) && ./config.status) + +$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status diff --git a/buildlib/copy.mak b/buildlib/copy.mak index 3ae11a7eb..e8fe43deb 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL) MKDIRS += $(dir $($(LOCAL)-LIST)) -$($(LOCAL)-LIST) : $(TO)/% : % +$($(LOCAL)-LIST) : $(TO)/% : % dirs echo Installing $< to $(@D) cp $< $(@D) diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index bb1c77e47..d46652520 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -11,9 +11,9 @@ MY_DOMAIN := $(APT_DOMAIN) endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile - (echo $(SRC) | xargs -n1 echo) > $@ +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE)) +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs + (echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@ startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) diff --git a/debian/changelog b/debian/changelog index af63bec4e..a11865891 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.9.4) UNRELEASED; urgency=low * apt-pkg/pkgcachegen.cc: - make IsDuplicatedDescription static so that it is really private as we don't need a symbol for it as it is not in a header + * Makefile, buildlib/*.mak: + - reshuffle dependencies so that parallel building seems to work -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 -- cgit v1.2.3 From 58921d7d062257d6165d51b44712140daef01ec8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 May 2012 00:40:36 +0200 Subject: * prepare-release: - apt-inst version isn't apt versions, so don't override variable --- debian/changelog | 2 ++ prepare-release | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a11865891..fc8efb8b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.9.4) UNRELEASED; urgency=low as we don't need a symbol for it as it is not in a header * Makefile, buildlib/*.mak: - reshuffle dependencies so that parallel building seems to work + * prepare-release: + - apt-inst version isn't apt versions, so don't override variable -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 diff --git a/prepare-release b/prepare-release index 821726ae2..477d638c7 100755 --- a/prepare-release +++ b/prepare-release @@ -8,8 +8,8 @@ LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" if [ "$1" = 'pre-export' ]; then libraryversioncheck() { - LIBRARY="$1" - VERSION="$2" + local LIBRARY="$1" + local VERSION="$2" if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)" exit 1 @@ -49,7 +49,7 @@ elif [ "$1" = 'post-build' ]; then elif [ "$1" = 'library' ]; then librarysymbols() { echo "Checking $1 in version $2" - tmpfile=$(mktemp) + local tmpfile=$(mktemp) dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile echo '=== Missing symbols:' grep '^+#MISSING' $tmpfile -- cgit v1.2.3 From 282c8f2551d57daf4f4d268b03e67f1752a9fde9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 May 2012 00:43:51 +0200 Subject: * debian/rules: - apt-utils packages manpages, so it should depend on build-doc --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fc8efb8b2..12097ca6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.9.4) UNRELEASED; urgency=low - reshuffle dependencies so that parallel building seems to work * prepare-release: - apt-inst version isn't apt versions, so don't override variable + * debian/rules: + - apt-utils packages manpages, so it should depend on build-doc -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 diff --git a/debian/rules b/debian/rules index 4b9510663..fcdff9d01 100755 --- a/debian/rules +++ b/debian/rules @@ -231,7 +231,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build +apt-utils: build build-doc dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3 From e4bc41c765f2b9fec55faa747e8330130c987678 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 14 May 2012 14:39:15 +0200 Subject: - separate manpages from the rest of the doc building - make apt and apt-utils packages depend on manpages instead of full doc --- Makefile | 4 ++-- buildlib/defaults.mak | 2 +- buildlib/manpage.mak | 3 ++- debian/changelog | 2 ++ debian/rules | 14 ++++++++++---- doc/makefile | 26 ++++++++++++++++++-------- test/Makefile | 2 +- 7 files changed, 36 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index a35ad1d37..24f5b3e2b 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ endif default: startup all .PHONY: headers library clean veryclean all binary program doc test update-po -all headers library clean veryclean binary program doc test update-po startup dirs: +all headers library clean veryclean binary program doc manpages test update-po startup dirs: $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ @@ -21,7 +21,7 @@ all headers library clean veryclean binary program doc test update-po startup di $(MAKE) -C po $@ $(MAKE) -C test $@ -all headers library clean veryclean binary program doc test update-po: startup dirs +all headers library clean veryclean binary program doc manpages test update-po: startup dirs dirs: startup diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c10813e9d..7b084f4b9 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -121,7 +121,7 @@ MKDIRS := $(BIN) all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean -startup headers library clean veryclean program test update-po: +startup headers library clean veryclean program test update-po manpages: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/manpage.mak b/buildlib/manpage.mak index 6cdf73ccf..063841d86 100644 --- a/buildlib/manpage.mak +++ b/buildlib/manpage.mak @@ -14,7 +14,8 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(addprefix $(DOC)/,$(SOURCE)) # Install generation hooks -doc: $($(LOCAL)-LIST) +doc: manpages +manpages: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) MKDIRS += $(DOC) diff --git a/debian/changelog b/debian/changelog index 12097ca6f..3de297513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,10 +6,12 @@ apt (0.9.4) UNRELEASED; urgency=low as we don't need a symbol for it as it is not in a header * Makefile, buildlib/*.mak: - reshuffle dependencies so that parallel building seems to work + - separate manpages from the rest of the doc building * prepare-release: - apt-inst version isn't apt versions, so don't override variable * debian/rules: - apt-utils packages manpages, so it should depend on build-doc + - make apt and apt-utils packages depend on manpages instead of full doc -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 diff --git a/debian/rules b/debian/rules index fcdff9d01..7b221fc2a 100755 --- a/debian/rules +++ b/debian/rules @@ -67,7 +67,8 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build: build/build-stamp -build-doc: build/build-doc-stamp +build-doc: build-manpages build/build-doc-stamp +build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak # The true is needed to force make to reload environment.mak after running @@ -97,11 +98,16 @@ else endif touch $@ -build/build-doc-stamp: build/configure-stamp +build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp # Add here commands to compile the package. $(MAKE) doc touch $@ +build/build-manpages-stamp: build/configure-stamp + # Add here commands to compile the package. + $(MAKE) manpages + touch $@ + clean: dh_testdir @@ -167,7 +173,7 @@ apt-doc: build-doc binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-doc +apt: build build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -231,7 +237,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-doc +apt-utils: build build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ diff --git a/doc/makefile b/doc/makefile index df2ddb25f..f52586935 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,6 +11,11 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) +MANPAGEPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) +MANPAGEPOLIST = $(patsubst %,manpages-translation-%,$(MANPAGEPO)) + +doc: manpages + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC # generate a list of accepted man page translations @@ -22,15 +27,26 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) +manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< +$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a + $(MAKE) -C $(dir $<) doc + +.PHONY: manpages dirs-manpage-subdirs $(MANPAGEPOLIST) +dirs: dirs-manpage-subdirs +dirs-manpage-subdirs: + for i in $(MANPAGEPO); do \ + test -d $$i || mkdir $$i; \ + test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + done + # Clean rule .PHONY: veryclean/$(LOCAL) +veryclean: veryclean/$(LOCAL) veryclean/$(LOCAL): -rm -rf $($(@F)-LIST) @@ -47,12 +63,6 @@ TARGET = binary include $(COPY_H) .PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc -doc: - for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ - test -d $$i || mkdir $$i; \ - test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - $(MAKE) -C $$i $@; \ - done clean: clean-subdirs veryclean: veryclean-subdirs diff --git a/test/Makefile b/test/Makefile index b42a90b25..8207ebdab 100644 --- a/test/Makefile +++ b/test/Makefile @@ -7,7 +7,7 @@ ifndef NOISY endif .PHONY: startup headers library clean veryclean all binary program doc test update-po -startup all clean veryclean binary program dirs test update-po: +startup all clean veryclean binary program dirs test update-po manpages: $(MAKE) -C libapt $@ $(MAKE) -C interactive-helper $@ -- cgit v1.2.3 From b65d5efc0c4097f76d18f9ac737e57b14fe6ec90 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 14 May 2012 15:16:26 +0200 Subject: * debian/control: - move doxygen and debiandoc-sgml to Build-Depends-Indep as docs are no longer build in the same target as the manpages --- debian/changelog | 3 +++ debian/control | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3de297513..f0a6aba3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ apt (0.9.4) UNRELEASED; urgency=low * debian/rules: - apt-utils packages manpages, so it should depend on build-doc - make apt and apt-utils packages depend on manpages instead of full doc + * debian/control: + - move doxygen and debiandoc-sgml to Build-Depends-Indep as docs + are no longer build in the same target as the manpages -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 diff --git a/debian/control b/debian/control index fc9d3f405..56de07a03 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,9 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), - zlib1g-dev, libbz2-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, - po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen + zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, + po4a (>= 0.34-2), autotools-dev, autoconf, automake +Build-Depends-Indep: debiandoc-sgml, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ -- cgit v1.2.3 From e1284a59de37efeedcc998ef61e8466c35b82eb2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 14 May 2012 16:53:43 +0200 Subject: * apt-pkg/acquire-methods.cc: - factor out into private Dequeue() to fix access to deleted pointer --- apt-pkg/acquire-method.cc | 23 ++++++++++------------- apt-pkg/acquire-method.h | 3 +++ debian/changelog | 2 ++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 2041fd9e9..e6e02bbc5 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -95,12 +95,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient) { std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n" << "Message: " << Err << " " << IP << "\n"; - // Dequeue - FetchItem *Tmp = Queue; - Queue = Queue->Next; - delete Tmp; - if (Tmp == QueueBack) - QueueBack = Queue; + Dequeue(); } else std::cout << "400 URI Failure\nURI: <UNKNOWN>\nMessage: " << Err << "\n"; @@ -211,13 +206,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) } std::cout << "\n" << std::flush; - - // Dequeue - FetchItem *Tmp = Queue; - Queue = Queue->Next; - delete Tmp; - if (Tmp == QueueBack) - QueueBack = Queue; + Dequeue(); } /*}}}*/ // AcqMethod::MediaFail - Syncronous request for new media /*{{{*/ @@ -465,3 +454,11 @@ void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash) SHA512Sum = Hash.SHA512.Result(); } /*}}}*/ +void pkgAcqMethod::Dequeue() { /*{{{*/ + FetchItem const * const Tmp = Queue; + Queue = Queue->Next; + if (Tmp == QueueBack) + QueueBack = Queue; + delete Tmp; +} + /*}}}*/ diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 2dd9ad685..00f99e0a0 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -104,6 +104,9 @@ class pkgAcqMethod pkgAcqMethod(const char *Ver,unsigned long Flags = 0); virtual ~pkgAcqMethod() {}; + + private: + void Dequeue(); }; /** @} */ diff --git a/debian/changelog b/debian/changelog index f0a6aba3b..7097a6e99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ apt (0.9.4) UNRELEASED; urgency=low * debian/control: - move doxygen and debiandoc-sgml to Build-Depends-Indep as docs are no longer build in the same target as the manpages + * apt-pkg/acquire-methods.cc: + - factor out into private Dequeue() to fix access to deleted pointer -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 -- cgit v1.2.3 From 5674f6b3163d73260e25ce7d350aaac50071eb0e Mon Sep 17 00:00:00 2001 From: Raphael Geissert <geissert@debian.org> Date: Mon, 14 May 2012 18:07:01 +0200 Subject: * apt-pkg/acquire*.cc: - handle redirections in the worker with the right method instead of in the method the redirection occured in (Closes: #668111) * methods/http.cc: - forbid redirects to change protocol --- apt-pkg/acquire-method.cc | 18 +++--------------- apt-pkg/acquire-worker.cc | 15 +++++++++++++++ apt-pkg/acquire.cc | 39 ++++++++++++++++++++++++++++++++++----- debian/changelog | 7 +++++++ methods/http.cc | 5 ++++- 5 files changed, 63 insertions(+), 21 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index e6e02bbc5..5bc1c159a 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -412,26 +412,14 @@ void pkgAcqMethod::Status(const char *Format,...) /*}}}*/ // AcqMethod::Redirect - Send a redirect message /*{{{*/ // --------------------------------------------------------------------- -/* This method sends the redirect message and also manipulates the queue - to keep the pipeline synchronized. */ +/* This method sends the redirect message and dequeues the item as + * the worker will enqueue again later on to the right queue */ void pkgAcqMethod::Redirect(const string &NewURI) { std::cout << "103 Redirect\nURI: " << Queue->Uri << "\n" << "New-URI: " << NewURI << "\n" << "\n" << std::flush; - - // Change the URI for the request. - Queue->Uri = NewURI; - - /* To keep the pipeline synchronized, move the current request to - the end of the queue, past the end of the current pipeline. */ - FetchItem *I; - for (I = Queue; I->Next != 0; I = I->Next) ; - I->Next = Queue; - Queue = Queue->Next; - I->Next->Next = 0; - if (QueueBack == 0) - QueueBack = I->Next; + Dequeue(); } /*}}}*/ // AcqMethod::FetchResult::FetchResult - Constructor /*{{{*/ diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index d6db8bc02..9d90b08bc 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -244,6 +244,21 @@ bool pkgAcquire::Worker::RunMessages() string NewURI = LookupTag(Message,"New-URI",URI.c_str()); Itm->URI = NewURI; + + ItemDone(); + + pkgAcquire::Item *Owner = Itm->Owner; + pkgAcquire::ItemDesc Desc = *Itm; + + // Change the status so that it can be dequeued + Owner->Status = pkgAcquire::Item::StatIdle; + // Mark the item as done (taking care of all queues) + // and then put it in the main queue again + OwnerQ->ItemDone(Itm); + OwnerQ->Owner->Enqueue(Desc); + + if (Log != 0) + Log->Done(Desc); break; } diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 5e1419056..a8a5abd34 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -244,11 +244,19 @@ void pkgAcquire::Dequeue(Item *Itm) { Queue *I = Queues; bool Res = false; - for (; I != 0; I = I->Next) - Res |= I->Dequeue(Itm); - if (Debug == true) clog << "Dequeuing " << Itm->DestFile << endl; + + for (; I != 0; I = I->Next) + { + if (I->Dequeue(Itm)) + { + Res = true; + if (Debug == true) + clog << "Dequeued from " << I->Name << endl; + } + } + if (Res == true) ToFetch--; } @@ -269,9 +277,30 @@ string pkgAcquire::QueueName(string Uri,MethodConfig const *&Config) /* Single-Instance methods get exactly one queue per URI. This is also used for the Access queue method */ if (Config->SingleInstance == true || QueueMode == QueueAccess) - return U.Access; + return U.Access; + + string AccessSchema = U.Access + ':', + FullQueueName = AccessSchema + U.Host; + unsigned int Instances = 0, SchemaLength = AccessSchema.length(); + + Queue *I = Queues; + for (; I != 0; I = I->Next) { + // if the queue already exists, re-use it + if (I->Name == FullQueueName) + return FullQueueName; + + if (I->Name.compare(0, SchemaLength, AccessSchema) == 0) + Instances++; + } + + if (Debug) { + clog << "Found " << Instances << " instances of " << U.Access << endl; + } + + if (Instances >= (unsigned int)_config->FindI("Acquire::QueueHost::Limit",10)) + return U.Access; - return U.Access + ':' + U.Host; + return FullQueueName; } /*}}}*/ // Acquire::GetConfig - Fetch the configuration information /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 7097a6e99..937bde918 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,13 @@ apt (0.9.4) UNRELEASED; urgency=low * apt-pkg/acquire-methods.cc: - factor out into private Dequeue() to fix access to deleted pointer + [ Raphael Geissert ] + * apt-pkg/acquire*.cc: + - handle redirections in the worker with the right method instead of + in the method the redirection occured in (Closes: #668111) + * methods/http.cc: + - forbid redirects to change protocol + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 apt (0.9.3) unstable; urgency=low diff --git a/methods/http.cc b/methods/http.cc index b450b6ffc..bb02176e9 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -985,7 +985,10 @@ HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) else { NextURI = DeQuoteString(Srv->Location); - return TRY_AGAIN_OR_REDIRECT; + URI tmpURI = NextURI; + // Do not allow a redirection to switch protocol + if (tmpURI.Access == "http") + return TRY_AGAIN_OR_REDIRECT; } /* else pass through for error message */ } -- cgit v1.2.3 From 57194e03a40d2ff323588acb8353eef2b881e5b2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 14 May 2012 18:07:34 +0200 Subject: adapt manual testcase to check redirects of dists/, too --- test/integration/skip-bug-602412-dequote-redirect | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/integration/skip-bug-602412-dequote-redirect b/test/integration/skip-bug-602412-dequote-redirect index a63d36246..689b671ce 100755 --- a/test/integration/skip-bug-602412-dequote-redirect +++ b/test/integration/skip-bug-602412-dequote-redirect @@ -19,18 +19,20 @@ echo "server.modules = ( \"mod_redirect\" ) server.document-root = \"$(readlink -f ./aptarchive)\" server.port = 8080 server.stat-cache-engine = \"disable\" -url.redirect = ( \"^/pool/(.*)$\" => \"/newpool/\$1\" )" > lighttpd.conf +url.redirect = ( \"^/pool/(.*)$\" => \"/newpool/\$1\", + \"^/dists/(.*)$\" => \"/newdists/\$1\" )" > lighttpd.conf mv aptarchive/pool aptarchive/newpool +mv aptarchive/dists aptarchive/newdists + lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid' lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null & addtrap "kill $!;" -local APTARCHIVE="file://$(readlink -f ./aptarchive)" +APTARCHIVE="file://$(readlink -f ./aptarchive)" for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#" done -aptget update -qq || msgdie 'apt-get update failed' -aptget install unrelated --download-only -qq || msgdie 'downloading package failed' - +aptget update || msgdie 'apt-get update failed' +aptget install unrelated --download-only || msgdie 'downloading package failed' -- cgit v1.2.3 From 046e104e1371584251ad2568a11090fe4ed9a42e Mon Sep 17 00:00:00 2001 From: Raphael Geissert <geissert@debian.org> Date: Mon, 14 May 2012 18:27:37 +0200 Subject: * methods/mirror.cc: - generate an equal sign also for the first arch (Closes: #669142) --- debian/changelog | 3 +++ methods/mirror.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 937bde918..88057d531 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.9.4) UNRELEASED; urgency=low in the method the redirection occured in (Closes: #668111) * methods/http.cc: - forbid redirects to change protocol + * methods/mirror.cc: + - generate an equal sign also for the first arch (Closes: #669142) + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 diff --git a/methods/mirror.cc b/methods/mirror.cc index eb6d97425..d6c5ba955 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -150,7 +150,7 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) for (std::vector<std::string>::const_iterator I = vec.begin(); I != vec.end(); ++I) if (I == vec.begin()) - fetch += "?arch" + (*I); + fetch += "?arch=" + (*I); else fetch += "&arch=" + (*I); -- cgit v1.2.3 From 8221431757c775ee875a061b184b5f6f2330f928 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 May 2012 00:12:21 +0200 Subject: * methods/http.cc: - after many years of pointless discussions disable http/1.1 pipelining by default as many webservers and proxies seem to be unable to conform to specification must's (rfc2616 section 8.1.2.2) (LP: #996151) --- debian/changelog | 4 ++++ doc/apt.conf.5.xml | 13 ++++++------- methods/http.cc | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88057d531..dd8ca72cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ apt (0.9.4) UNRELEASED; urgency=low [ David Kalnischkies ] + * methods/http.cc: + - after many years of pointless discussions disable http/1.1 pipelining + by default as many webservers and proxies seem to be unable to conform + to specification must's (rfc2616 section 8.1.2.2) (LP: #996151) * apt-pkg/pkgcachegen.cc: - make IsDuplicatedDescription static so that it is really private as we don't need a symbol for it as it is not in a header diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index c2220b1bf..2f95c1e52 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -340,13 +340,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The option <literal>timeout</literal> sets the timeout timer used by the method, this applies to all things including connection timeout and data timeout.</para> - <para>One setting is provided to control the pipeline depth in cases where the - remote server is not RFC conforming or buggy (such as Squid 2.0.2). - <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 - indicating how many outstanding requests APT should send. A value of - zero MUST be specified if the remote host does not properly linger - on TCP connections - otherwise data corruption will occur. Hosts which - require this are in violation of RFC 2068.</para> + <para>The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to + enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e.g. on + high-latency connections. It specifies how many requests are send in a pipeline. + Previous APT versions had a default of 10 for this setting, but the default value + is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers + and proxies which choose to not conform to the HTTP/1.1 specification.</para> <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal> which accepts integer values in kilobyte. The default value is 0 which deactivates diff --git a/methods/http.cc b/methods/http.cc index bb02176e9..c8e6f1b7b 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -61,7 +61,7 @@ using namespace std; string HttpMethod::FailFile; int HttpMethod::FailFd = -1; time_t HttpMethod::FailTime = 0; -unsigned long PipelineDepth = 10; +unsigned long PipelineDepth = 0; unsigned long TimeOut = 120; bool AllowRedirect = false; bool Debug = false; -- cgit v1.2.3 From b270388bef045df8c1b364338f545791bba222c1 Mon Sep 17 00:00:00 2001 From: Marius Vollmer <marius.vollmer@nokia.com> Date: Tue, 15 May 2012 21:17:08 +0200 Subject: * apt-pkg/algorithms.cc: - fix memory leak of Flags in pkgSimulate by a proper destructor --- apt-pkg/algorithms.cc | 6 ++++++ apt-pkg/algorithms.h | 1 + debian/changelog | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index e7b359981..2d710097a 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -58,6 +58,12 @@ pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache), FileNames[I] = Jnk; } /*}}}*/ +// Simulate::~Simulate - Destructor /*{{{*/ +pkgSimulate::~pkgSimulate() +{ + delete[] Flags; +} + /*}}}*/ // Simulate::Describe - Describe a package /*{{{*/ // --------------------------------------------------------------------- /* Parameter Current == true displays the current package version, diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 076542c20..aff8a68f2 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -78,6 +78,7 @@ private: public: pkgSimulate(pkgDepCache *Cache); + ~pkgSimulate(); }; /*}}}*/ class pkgProblemResolver /*{{{*/ diff --git a/debian/changelog b/debian/changelog index dd8ca72cd..e451bf755 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,10 @@ apt (0.9.4) UNRELEASED; urgency=low - generate an equal sign also for the first arch (Closes: #669142) + [ Marius Vollmer ] + * apt-pkg/algorithms.cc: + - fix memory leak of Flags in pkgSimulate by a proper destructor + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 apt (0.9.3) unstable; urgency=low -- cgit v1.2.3 From 500400fedd6e57eb0162a0e41fdd9ba05a2cae3d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 16 May 2012 15:55:32 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - ensure that we close compressed fds, wait for forks and such even if the FileFd itself is set to not autoclose the given Fd --- apt-pkg/contrib/fileutl.cc | 65 +++++++++++++++++++++++++++++----------------- debian/changelog | 3 +++ 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index c8e685a5a..c7f78cdfb 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -81,6 +81,31 @@ class FileFdPrivate { FileFdPrivate() : gz(NULL), bz2(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false), openmode(0), seekpos(0) {}; + bool CloseDown(std::string const &FileName) + { + bool Res = true; +#ifdef HAVE_ZLIB + if (gz != NULL) { + int const e = gzclose(gz); + gz = NULL; + // gzdclose() on empty files always fails with "buffer error" here, ignore that + if (e != 0 && e != Z_BUF_ERROR) + Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str()); + } +#endif +#ifdef HAVE_BZ2 + if (bz2 != NULL) { + BZ2_bzclose(bz2); + bz2 = NULL; + } +#endif + if (compressor_pid > 0) + ExecWait(compressor_pid, "FileFdCompressor", true); + compressor_pid = -1; + + return Res; + } + ~FileFdPrivate() { CloseDown(""); } }; // RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ @@ -1171,6 +1196,12 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C FileFd::~FileFd() { Close(); + if (d != NULL) + { + d->CloseDown(FileName); + delete d; + d = NULL; + } } /*}}}*/ // FileFd::Read - Read a bit of the file /*{{{*/ @@ -1397,7 +1428,7 @@ bool FileFd::Seek(unsigned long long To) if (d->compressed_fd > 0) if (lseek(d->compressed_fd, 0, SEEK_SET) != 0) iFd = d->compressed_fd; - if (iFd <= 0) + if (iFd < 0) { Flags |= Fail; return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); @@ -1670,21 +1701,15 @@ bool FileFd::Close() bool Res = true; if ((Flags & AutoClose) == AutoClose) { -#ifdef HAVE_ZLIB - if (d != NULL && d->gz != NULL) { - int const e = gzclose(d->gz); - // gzdclose() on empty files always fails with "buffer error" here, ignore that - if (e != 0 && e != Z_BUF_ERROR) - Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str()); - } else -#endif -#ifdef HAVE_BZ2 - if (d != NULL && d->bz2 != NULL) - BZ2_bzclose(d->bz2); - else -#endif - if (iFd > 0 && close(iFd) != 0) - Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str()); + if ((Flags & Compressed) != Compressed && iFd > 0 && close(iFd) != 0) + Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str()); + + if (d != NULL) + { + Res &= d->CloseDown(FileName); + delete d; + d = NULL; + } } if ((Flags & Replace) == Replace && iFd >= 0) { @@ -1702,14 +1727,6 @@ bool FileFd::Close() if (unlink(FileName.c_str()) != 0) Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str()); - if (d != NULL) - { - if (d->compressor_pid > 0) - ExecWait(d->compressor_pid, "FileFdCompressor", true); - delete d; - d = NULL; - } - if (Res == false) Flags |= Fail; return Res; diff --git a/debian/changelog b/debian/changelog index e451bf755..922c0720b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ apt (0.9.4) UNRELEASED; urgency=low are no longer build in the same target as the manpages * apt-pkg/acquire-methods.cc: - factor out into private Dequeue() to fix access to deleted pointer + * apt-pkg/contrib/fileutl.cc: + - ensure that we close compressed fds, wait for forks and such even if + the FileFd itself is set to not autoclose the given Fd [ Raphael Geissert ] * apt-pkg/acquire*.cc: -- cgit v1.2.3 From 65f9983436be310c768c4c42531ceea1e3a6d4ac Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 16 May 2012 16:44:15 +0200 Subject: * cmdline/apt-get.cc: - use the host architecture, not the build architecture for matching of [architecture restrictions] in Build-Depends (Closes: #672927) * --- apt-pkg/srcrecords.h | 1 + cmdline/apt-get.cc | 14 ++++- debian/changelog | 6 ++ .../test-bug-632221-cross-dependency-satisfaction | 66 ++++++++++++++-------- 4 files changed, 61 insertions(+), 26 deletions(-) diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 06f0dce6c..ed69d0d72 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -71,6 +71,7 @@ class pkgSrcRecords virtual std::string Section() const = 0; virtual const char **Binaries() = 0; // Ownership does not transfer + //FIXME: Add a parameter to specify which architecture to use for [wildcard] matching virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0; static const char *BuildDepType(unsigned char const &Type); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index dd9313bff..c996017b8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2789,8 +2789,18 @@ bool DoBuildDep(CommandLine &CmdL) // Process the build-dependencies vector<pkgSrcRecords::Parser::BuildDepRec> BuildDeps; - if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) - return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); + // FIXME: Can't specify architecture to use for [wildcard] matching, so switch default arch temporary + if (hostArch.empty() == false) + { + std::string nativeArch = _config->Find("APT::Architecture"); + _config->Set("APT::Architecture", hostArch); + bool Success = Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch); + _config->Set("APT::Architecture", nativeArch); + if (Success == false) + return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); + } + else if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) + return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); // Also ensure that build-essential packages are present Configuration::Item const *Opts = _config->Tree("APT::Build-Essential"); diff --git a/debian/changelog b/debian/changelog index 922c0720b..64af5bf60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.9.4) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - ensure that we close compressed fds, wait for forks and such even if the FileFd itself is set to not autoclose the given Fd + * cmdline/apt-get.cc: + - use the host architecture, not the build architecture for matching + of [architecture restrictions] in Build-Depends (Closes: #672927) [ Raphael Geissert ] * apt-pkg/acquire*.cc: @@ -39,6 +42,9 @@ apt (0.9.4) UNRELEASED; urgency=low * apt-pkg/algorithms.cc: - fix memory leak of Flags in pkgSimulate by a proper destructor + [ David Kalnischkies ] + * + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 apt (0.9.3) unstable; urgency=low diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction index 30df48604..a128366c5 100755 --- a/test/integration/test-bug-632221-cross-dependency-satisfaction +++ b/test/integration/test-bug-632221-cross-dependency-satisfaction @@ -18,8 +18,10 @@ insertpackage 'unstable' 'libfwibble-dev' 'amd64,armel' '1.0' 'Depends: libfwibb insertpackage 'unstable' 'cool' 'amd64,armel' '1.0' 'Multi-Arch: allowed' insertpackage 'unstable' 'amdboot' 'amd64' '1.0' insertpackage 'unstable' 'foreigner' 'amd64,armel' '1.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'arm-stuff' 'armel' '1.0' +insertpackage 'unstable' 'linux-stuff' 'amd64,armel' '1.0' -insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev' +insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev, arm-stuff [any-arm] | linux-stuff [ linux-any]' setupaptarchive @@ -27,7 +29,8 @@ testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot cool doxygen foreigner libc6 libc6-dev libfwibble-dev libfwibble1 -0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. + linux-stuff +0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded. Inst amdboot (1.0 unstable [amd64]) Inst cool (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) @@ -36,6 +39,7 @@ Inst libc6 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [amd64]) Inst libfwibble1 (1.0 unstable [amd64]) Inst libfwibble-dev (1.0 unstable [amd64]) +Inst linux-stuff (1.0 unstable [amd64]) Conf amdboot (1.0 unstable [amd64]) Conf cool (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) @@ -43,15 +47,17 @@ Conf foreigner (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) Conf libc6-dev (1.0 unstable [amd64]) Conf libfwibble1 (1.0 unstable [amd64]) -Conf libfwibble-dev (1.0 unstable [amd64])' aptget build-dep apt -s +Conf libfwibble-dev (1.0 unstable [amd64]) +Conf linux-stuff (1.0 unstable [amd64])' aptget build-dep apt -s testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot cool doxygen foreigner libc6 libc6:armel libc6-dev libc6-dev:armel - libfwibble-dev:armel libfwibble1:armel -0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded. + amdboot arm-stuff:armel cool doxygen foreigner libc6 libc6:armel libc6-dev + libc6-dev:armel libfwibble-dev:armel libfwibble1:armel +0 upgraded, 11 newly installed, 0 to remove and 0 not upgraded. Inst amdboot (1.0 unstable [amd64]) +Inst arm-stuff:armel (1.0 unstable [armel]) Inst cool (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) Inst foreigner (1.0 unstable [amd64]) @@ -62,6 +68,7 @@ Inst libc6-dev:armel (1.0 unstable [armel]) Inst libfwibble1:armel (1.0 unstable [armel]) Inst libfwibble-dev:armel (1.0 unstable [armel]) Conf amdboot (1.0 unstable [amd64]) +Conf arm-stuff:armel (1.0 unstable [armel]) Conf cool (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) Conf foreigner (1.0 unstable [amd64]) @@ -77,10 +84,11 @@ configarchitecture 'armel' 'amd64' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot:amd64 cool doxygen foreigner libc6 libc6-dev libfwibble-dev - libfwibble1 -0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. + amdboot:amd64 arm-stuff cool doxygen foreigner libc6 libc6-dev + libfwibble-dev libfwibble1 +0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded. Inst amdboot:amd64 (1.0 unstable [amd64]) +Inst arm-stuff (1.0 unstable [armel]) Inst cool (1.0 unstable [armel]) Inst doxygen (1.0 unstable [armel]) Inst foreigner (1.0 unstable [armel]) @@ -89,6 +97,7 @@ Inst libc6-dev (1.0 unstable [armel]) Inst libfwibble1 (1.0 unstable [armel]) Inst libfwibble-dev (1.0 unstable [armel]) Conf amdboot:amd64 (1.0 unstable [amd64]) +Conf arm-stuff (1.0 unstable [armel]) Conf cool (1.0 unstable [armel]) Conf doxygen (1.0 unstable [armel]) Conf foreigner (1.0 unstable [armel]) @@ -101,8 +110,8 @@ testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot:amd64 cool doxygen foreigner libc6:amd64 libc6 libc6-dev:amd64 - libc6-dev libfwibble-dev:amd64 libfwibble1:amd64 -0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded. + libc6-dev libfwibble-dev:amd64 libfwibble1:amd64 linux-stuff:amd64 +0 upgraded, 11 newly installed, 0 to remove and 0 not upgraded. Inst amdboot:amd64 (1.0 unstable [amd64]) Inst cool (1.0 unstable [armel]) Inst doxygen (1.0 unstable [armel]) @@ -113,6 +122,7 @@ Inst libc6-dev:amd64 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [armel]) Inst libfwibble1:amd64 (1.0 unstable [amd64]) Inst libfwibble-dev:amd64 (1.0 unstable [amd64]) +Inst linux-stuff:amd64 (1.0 unstable [amd64]) Conf amdboot:amd64 (1.0 unstable [amd64]) Conf cool (1.0 unstable [armel]) Conf doxygen (1.0 unstable [armel]) @@ -122,7 +132,8 @@ Conf libc6 (1.0 unstable [armel]) Conf libc6-dev:amd64 (1.0 unstable [amd64]) Conf libc6-dev (1.0 unstable [armel]) Conf libfwibble1:amd64 (1.0 unstable [amd64]) -Conf libfwibble-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 +Conf libfwibble-dev:amd64 (1.0 unstable [amd64]) +Conf linux-stuff:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 configarchitecture 'amd64' 'armel' @@ -132,28 +143,31 @@ insertinstalledpackage 'foreigner' 'armel' '0.5' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot doxygen libc6 libc6-dev libfwibble-dev libfwibble1 -0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded. + amdboot doxygen libc6 libc6-dev libfwibble-dev libfwibble1 linux-stuff +0 upgraded, 7 newly installed, 0 to remove and 2 not upgraded. Inst amdboot (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [amd64]) Inst libfwibble1 (1.0 unstable [amd64]) Inst libfwibble-dev (1.0 unstable [amd64]) +Inst linux-stuff (1.0 unstable [amd64]) Conf amdboot (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) Conf libc6-dev (1.0 unstable [amd64]) Conf libfwibble1 (1.0 unstable [amd64]) -Conf libfwibble-dev (1.0 unstable [amd64])' aptget build-dep apt -s +Conf libfwibble-dev (1.0 unstable [amd64]) +Conf linux-stuff (1.0 unstable [amd64])' aptget build-dep apt -s testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: - amdboot doxygen libc6 libc6:armel libc6-dev libc6-dev:armel + amdboot arm-stuff:armel doxygen libc6 libc6:armel libc6-dev libc6-dev:armel libfwibble-dev:armel libfwibble1:armel -0 upgraded, 8 newly installed, 0 to remove and 2 not upgraded. +0 upgraded, 9 newly installed, 0 to remove and 2 not upgraded. Inst amdboot (1.0 unstable [amd64]) +Inst arm-stuff:armel (1.0 unstable [armel]) Inst doxygen (1.0 unstable [amd64]) Inst libc6 (1.0 unstable [amd64]) Inst libc6:armel (1.0 unstable [armel]) @@ -162,6 +176,7 @@ Inst libc6-dev:armel (1.0 unstable [armel]) Inst libfwibble1:armel (1.0 unstable [armel]) Inst libfwibble-dev:armel (1.0 unstable [armel]) Conf amdboot (1.0 unstable [amd64]) +Conf arm-stuff:armel (1.0 unstable [armel]) Conf doxygen (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) Conf libc6:armel (1.0 unstable [armel]) @@ -178,10 +193,12 @@ Building dependency tree... The following packages will be REMOVED: cool:amd64 The following NEW packages will be installed: - amdboot:amd64 cool doxygen libc6 libc6-dev libfwibble-dev libfwibble1 -0 upgraded, 7 newly installed, 1 to remove and 1 not upgraded. + amdboot:amd64 arm-stuff cool doxygen libc6 libc6-dev libfwibble-dev + libfwibble1 +0 upgraded, 8 newly installed, 1 to remove and 1 not upgraded. Remv cool:amd64 [0.5] Inst amdboot:amd64 (1.0 unstable [amd64]) +Inst arm-stuff (1.0 unstable [armel]) Inst cool (1.0 unstable [armel]) Inst doxygen (1.0 unstable [armel]) Inst libc6 (1.0 unstable [armel]) @@ -189,6 +206,7 @@ Inst libc6-dev (1.0 unstable [armel]) Inst libfwibble1 (1.0 unstable [armel]) Inst libfwibble-dev (1.0 unstable [armel]) Conf amdboot:amd64 (1.0 unstable [amd64]) +Conf arm-stuff (1.0 unstable [armel]) Conf cool (1.0 unstable [armel]) Conf doxygen (1.0 unstable [armel]) Conf libc6 (1.0 unstable [armel]) @@ -200,8 +218,8 @@ testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: amdboot:amd64 doxygen libc6:amd64 libc6 libc6-dev:amd64 libc6-dev - libfwibble-dev:amd64 libfwibble1:amd64 -0 upgraded, 8 newly installed, 0 to remove and 2 not upgraded. + libfwibble-dev:amd64 libfwibble1:amd64 linux-stuff:amd64 +0 upgraded, 9 newly installed, 0 to remove and 2 not upgraded. Inst amdboot:amd64 (1.0 unstable [amd64]) Inst doxygen (1.0 unstable [armel]) Inst libc6:amd64 (1.0 unstable [amd64]) @@ -210,6 +228,7 @@ Inst libc6-dev:amd64 (1.0 unstable [amd64]) Inst libc6-dev (1.0 unstable [armel]) Inst libfwibble1:amd64 (1.0 unstable [amd64]) Inst libfwibble-dev:amd64 (1.0 unstable [amd64]) +Inst linux-stuff:amd64 (1.0 unstable [amd64]) Conf amdboot:amd64 (1.0 unstable [amd64]) Conf doxygen (1.0 unstable [armel]) Conf libc6:amd64 (1.0 unstable [amd64]) @@ -217,6 +236,5 @@ Conf libc6 (1.0 unstable [armel]) Conf libc6-dev:amd64 (1.0 unstable [amd64]) Conf libc6-dev (1.0 unstable [armel]) Conf libfwibble1:amd64 (1.0 unstable [amd64]) -Conf libfwibble-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 - - +Conf libfwibble-dev:amd64 (1.0 unstable [amd64]) +Conf linux-stuff:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 -- cgit v1.2.3 From 335e2c82afc5ddb305c9e36fac17a024d7dc9c3f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 17 May 2012 14:21:13 +0200 Subject: add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11 --- debian/changelog | 4 +--- methods/http.cc | 2 +- methods/https.cc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64af5bf60..bcc29eb86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.9.4) UNRELEASED; urgency=low - after many years of pointless discussions disable http/1.1 pipelining by default as many webservers and proxies seem to be unable to conform to specification must's (rfc2616 section 8.1.2.2) (LP: #996151) + - add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11 * apt-pkg/pkgcachegen.cc: - make IsDuplicatedDescription static so that it is really private as we don't need a symbol for it as it is not in a header @@ -42,9 +43,6 @@ apt (0.9.4) UNRELEASED; urgency=low * apt-pkg/algorithms.cc: - fix memory leak of Flags in pkgSimulate by a proper destructor - [ David Kalnischkies ] - * - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 May 2012 23:26:59 +0200 apt (0.9.3) unstable; urgency=low diff --git a/methods/http.cc b/methods/http.cc index c8e6f1b7b..acf25a42a 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -758,7 +758,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; } Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent", - "Debian APT-HTTP/1.3 ("PACKAGE_VERSION")") + "\r\n\r\n"; + "Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") + "\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/https.cc b/methods/https.cc index fac7ba790..c1a49ba60 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -219,7 +219,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_USERAGENT, _config->Find("Acquire::https::User-Agent", _config->Find("Acquire::http::User-Agent", - "Debian APT-CURL/1.0 ("PACKAGE_VERSION")").c_str()).c_str()); + "Debian APT-CURL/1.0 (" PACKAGE_VERSION ")").c_str()).c_str()); // set timeout int const timeout = _config->FindI("Acquire::https::Timeout", -- cgit v1.2.3 From 1c8754c2fc67e6bafd92af8cb964661e858c6f41 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 17 May 2012 22:21:03 +0200 Subject: * doc/makefile: - build manpages with the correct l10n.gentext.default.language setting to get the correct section titles provided by docbook --- buildlib/po4a_manpage.mak | 2 +- debian/changelog | 3 +++ doc/makefile | 2 ++ doc/manpage-style.xsl | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 404bb57a5..5814180d8 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=../manpage-style.xsl +STYLESHEET=manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) diff --git a/debian/changelog b/debian/changelog index bcc29eb86..b6464388d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ apt (0.9.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - use the host architecture, not the build architecture for matching of [architecture restrictions] in Build-Depends (Closes: #672927) + * doc/makefile: + - build manpages with the correct l10n.gentext.default.language setting + to get the correct section titles provided by docbook [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/makefile b/doc/makefile index f52586935..76e29e2b9 100644 --- a/doc/makefile +++ b/doc/makefile @@ -42,6 +42,8 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + test -f $$i/manpage-style.xsl || sed "/<!-- LANGUAGE -->/ i\ +<xsl:param name=\"l10n.gentext.default.language\" select=\"'$$i'\" />" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl index 85aa4521f..ef349f064 100644 --- a/doc/manpage-style.xsl +++ b/doc/manpage-style.xsl @@ -5,6 +5,7 @@ <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" /> <xsl:param name="man.output.encoding" select="'UTF-8'" /> +<!-- LANGUAGE --> <xsl:template match="email"><<xsl:apply-templates/>></xsl:template> -- cgit v1.2.3 From 4d704f20868dea9efca0f8f609ffcca8da2fa7b9 Mon Sep 17 00:00:00 2001 From: Chris Leick <c.leick@vollbio.de> Date: Sat, 19 May 2012 17:08:48 +0200 Subject: =?UTF-8?q?fix=20authenificated=E2=86=92authenticated=20typo=20in?= =?UTF-8?q?=20sources.list=20manpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/po/apt-doc.pot | 6 +++--- doc/po/de.po | 4 ++-- doc/po/es.po | 4 ++-- doc/po/fr.po | 4 ++-- doc/po/it.po | 4 ++-- doc/po/ja.po | 4 ++-- doc/po/pl.po | 4 ++-- doc/po/pt.po | 4 ++-- doc/po/pt_BR.po | 4 ++-- doc/sources.list.5.xml | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index fe4f6b497..ab1accaa6 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6996,12 +6996,12 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the " +"this source are always authenticated even if the " "<filename>Release</filename> file is not signed or the signature can't be " "checked. This disables parts of &apt-secure; and should therefore only be " "used in a local and trusted context. <literal>trusted=no</literal> is the " -"opposite which handles even correctly authenificated sources as not " -"authenificated." +"opposite which handles even correctly authenticated sources as not " +"authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/de.po b/doc/po/de.po index 040baac57..e6069a831 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -9496,11 +9496,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/es.po b/doc/po/es.po index 542926fbf..d92602ae4 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -9475,11 +9475,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/fr.po b/doc/po/fr.po index e57b45907..5705d1582 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9443,11 +9443,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/it.po b/doc/po/it.po index 558999e96..b1522cafe 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -6959,11 +6959,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/ja.po b/doc/po/ja.po index dce950e93..88f942068 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -9430,11 +9430,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" # type: Content of: <refentry><refsect1><para> diff --git a/doc/po/pl.po b/doc/po/pl.po index 54d5265db..75f3089fa 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -8341,11 +8341,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/pt.po b/doc/po/pt.po index 84ebf0735..734a06f71 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -9361,11 +9361,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 3ada38fca..0de64b3ae 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -7461,11 +7461,11 @@ msgstr "" #: sources.list.5.xml:121 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " -"this source are always authenificated even if the <filename>Release</" +"this source are always authenticated even if the <filename>Release</" "filename> file is not signed or the signature can't be checked. This " "disables parts of &apt-secure; and should therefore only be used in a local " "and trusted context. <literal>trusted=no</literal> is the opposite which " -"handles even correctly authenificated sources as not authenificated." +"handles even correctly authenticated sources as not authenticated." msgstr "" #. type: Content of: <refentry><refsect1><para> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index dd94f58f1..08928109a 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -119,10 +119,10 @@ be downloaded. If this option is not set all architectures defined by the <literal>APT::Architectures</literal> option will be downloaded.</para></listitem> <listitem><para><literal>trusted=yes</literal> can be set to indicate that packages - from this source are always authenificated even if the <filename>Release</filename> file + from this source are always authenticated even if the <filename>Release</filename> file is not signed or the signature can't be checked. This disables parts of &apt-secure; and should therefore only be used in a local and trusted context. <literal>trusted=no</literal> - is the opposite which handles even correctly authenificated sources as not authenificated.</para></listitem> + is the opposite which handles even correctly authenticated sources as not authenticated.</para></listitem> </itemizedlist></para> <para>It is important to list sources in order of preference, with the most -- cgit v1.2.3 From 2d49cf5eeb041ebb115ed2bdec4840f0523071ee Mon Sep 17 00:00:00 2001 From: Chris Leick <c.leick@vollbio.de> Date: Sat, 19 May 2012 18:38:27 +0200 Subject: * doc/po/de.po: - updated german manpage translation by Chris Leick, thanks! --- debian/changelog | 2 + doc/po/de.po | 518 ++++++------------------------------------------------- 2 files changed, 50 insertions(+), 470 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6464388d..d419f9986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ apt (0.9.4) UNRELEASED; urgency=low * doc/makefile: - build manpages with the correct l10n.gentext.default.language setting to get the correct section titles provided by docbook + * doc/po/de.po: + - updated german manpage translation by Chris Leick, thanks! [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/po/de.po b/doc/po/de.po index e6069a831..a4ddf6a87 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -658,14 +658,14 @@ msgstr "" msgid "" "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::" "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">" -msgstr "" +msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">" #. type: Plain text #: apt.ent:217 msgid "" "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY " "synopsis-config-file \"config_file\">" -msgstr "" +msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">" #. type: Plain text #: apt.ent:220 @@ -673,49 +673,49 @@ msgid "" "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -" "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release " "\"target_release\">" -msgstr "" +msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">" #. type: Plain text #: apt.ent:223 msgid "" "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY " "synopsis-architecture \"architecture\">" -msgstr "" +msgstr "<!ENTITY synopsis-architecture \"Architektur\">" #. type: Plain text #: apt.ent:226 msgid "" "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome " "--> <!ENTITY synopsis-pkg \"pkg\">" -msgstr "" +msgstr "<!ENTITY synopsis-pkg \"Paket\">" #. type: Plain text #: apt.ent:229 msgid "" "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!" "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">" -msgstr "" +msgstr "<!ENTITY synopsis-pkg-ver-number \"Paketversionsnummer\">" #. type: Plain text #: apt.ent:232 msgid "" "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache " "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">" -msgstr "" +msgstr "<!ENTITY synopsis-prefix \"Präfix\">" #. type: Plain text #: apt.ent:235 msgid "" "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search " "awesome --> <!ENTITY synopsis-regex \"regex\">" -msgstr "" +msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">" #. type: Plain text #: apt.ent:238 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 "" +msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">" #. type: Plain text #: apt.ent:241 @@ -723,14 +723,14 @@ msgid "" "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. " "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory " "\"temporary_directory\">" -msgstr "" +msgstr "<!ENTITY synopsis-tmp-directory \"temporäres_Verzeichnis\">" #. type: Plain text #: apt.ent:244 msgid "" "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY " "synopsis-filename \"filename\">" -msgstr "" +msgstr "<!ENTITY synopsis-filename \"Dateiname\">" #. type: Plain text #: apt.ent:250 @@ -739,14 +739,16 @@ msgid "" "packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" "ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " "\"section\"> <!ENTITY synopsis-override \"override\">" -msgstr "" +msgstr "<!ENTITY synopsis-path \"Pfad\"> <!ENTITY synopsis-pathprefix \"Pfadpräfix\"> " +"<!ENTITY synopsis-section \"Abschnitt\"><!ENTITY synopsis-override " +"\"außer_Kraft_setzen\">" #. type: Plain text #: apt.ent:253 msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" -msgstr "" +msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">" #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -1447,13 +1449,6 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:291 -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be tweaked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -2000,10 +1995,9 @@ msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:89 -#, fuzzy #| msgid "<option>-y</option>" msgid "<option>--empty</option>" -msgstr "<option>-y</option>" +msgstr "<option>-empty</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:90 @@ -2011,6 +2005,8 @@ msgid "" "Include options which have an empty value. This is the default, so use --no-" "empty to remove them from the output." msgstr "" +"schließt Optionen ein, die einen leeren Wert haben. Dies ist die Vorgabe, " +"benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:95 @@ -2018,6 +2014,8 @@ msgid "" "<option>--format '<replaceable>%f "%v";%" "n</replaceable>'</option>" msgstr "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:96 @@ -2028,6 +2026,12 @@ msgid "" "be quoted. Additionally %n will be replaced by a newline, %N " "by a tab. A % can be printed by using %%." msgstr "" +"definiert die Ausgabe jeder Option. %t wird durch den Markierungsnamen " +"ersetzt, %f durch den kompletten Markierungsnamen und %v durch " +"den Wert der Option. Benutzen Sie großgeschriebene Buchstaben, damit die " +"jeweiligen Werte in Anführungszeichen gesetzt werden. %n wird " +"zusätzlich durch einen Zeilenumbruch ersetzt, %N durch einen " +"Tabulator. Ein % kann mittels %% ausgegeben werden." #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 @@ -3141,18 +3145,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:510 -#, fuzzy -#| msgid "" -#| "Generate the given checksum. These options default to on, when turned off " -#| "the generated index files will not have the checksum fields where " -#| "possible. Configuration Items: <literal>APT::FTPArchive::" -#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::" -#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</" -#| "replaceable></literal> where <literal><replaceable>Index</replaceable></" -#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> " -#| "or <literal>Release</literal> and <literal><replaceable>Checksum</" -#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</" -#| "literal> or <literal>SHA256</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " @@ -3709,13 +3701,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:179 -#, fuzzy -#| msgid "" -#| "If the <option>--compile</option> option is specified then the package " -#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" -#| "command> for the architecture as defined by the <command>--host-" -#| "architecture</command> option. If <option>--download-only</option> is " -#| "specified then the source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " @@ -3763,13 +3748,6 @@ msgstr "build-dep" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:198 -#, fuzzy -#| msgid "" -#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " -#| "an attempt to satisfy the build dependencies for a source package. By " -#| "default the dependencies are satisfied to build the package natively. If " -#| "desired a host-architecture can be specified with the <option>--host-" -#| "architecture</option> option instead." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " "attempt to satisfy the build dependencies for a source package. By default " @@ -3805,10 +3783,6 @@ msgstr "download" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:210 -#, fuzzy -#| msgid "" -#| "<literal>download</literal> will download the given binary package into " -#| "the current directory." msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." @@ -3867,11 +3841,6 @@ msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:236 -#, fuzzy -#| msgid "" -#| "<literal>autoremove</literal> is used to remove packages that were " -#| "automatically installed to satisfy dependencies for other packages and " -#| "are now no longer needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -4137,23 +4106,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:353 -#, fuzzy -#| msgid "<option>--assume-yes</option>" msgid "<option>--assume-no</option>" -msgstr "<option>--assume-yes</option>" +msgstr "<option>--assume-no</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:354 -#, fuzzy -#| msgid "" -#| "Compile source packages after downloading them. Configuration Item: " -#| "<literal>APT::Get::Compile</literal>." msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." msgstr "" -"Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. " -"Konfigurationselement: <literal>APT::Get::Compile</literal>." +"automatisches »nein« auf alle Anfragen. Konfigurationselement: " +"<literal>APT::Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:358 @@ -4647,15 +4610,10 @@ msgstr "Befehle" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:40 msgid "add &synopsis-param-filename;" -msgstr "" +msgstr "add &synopsis-param-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:44 -#, fuzzy -#| msgid "" -#| "Add a new key to the list of trusted keys. The key is read from " -#| "<replaceable>filename</replaceable>, or standard input if " -#| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" "Add a new key to the list of trusted keys. The key is read from &synopsis-" "param-filename;, or standard input if &synopsis-param-filename; is <literal>-" @@ -4669,7 +4627,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:52 msgid "del &synopsis-param-keyid;" -msgstr "" +msgstr "del &synopsis-param-keyid;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:56 @@ -4680,16 +4638,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:63 msgid "export &synopsis-param-keyid;" -msgstr "" +msgstr "export &synopsis-param-keyid;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:67 -#, fuzzy -#| msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgid "Output the key &synopsis-param-keyid; to standard output." msgstr "" -"Den Schlüssel <replaceable>Schlüssel-ID</replaceable> auf der " -"Standardausgabe ausgeben." +"Den Schlüssel &synopsis-param-keyid; auf der Standardausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:74 @@ -4757,14 +4712,6 @@ msgstr "net-update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:137 -#, fuzzy -#| msgid "" -#| "Work similar to the <command>update</command> command above, but get the " -#| "archive keyring from an URI instead and validate it against a master " -#| "key. This requires an installed &wget; and an APT build configured to " -#| "have a server to fetch from and a master keyring to validate. APT in " -#| "Debian does not support this command and relies on <command>update</" -#| "command> instead, but Ubuntu's APT does." msgid "" "Work similar to the <command>update</command> command above, but get the " "archive keyring from an URI instead and validate it against a master key. " @@ -4797,14 +4744,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:157 -#, fuzzy -#| msgid "" -#| "With this option it is possible to specify a specific keyring file the " -#| "command should operate on. The default is that a command is executed on " -#| "the <filename>trusted.gpg</filename> file as well as on all parts in the " -#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted." -#| "gpg</filename> is the primary keyring which means that e.g. new keys are " -#| "added to this one." msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -5366,14 +5305,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:191 -#, fuzzy -#| msgid "" -#| "For more background information you might want to review the <ulink url=" -#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" -#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " -#| "Manual (available also in the harden-doc package) and the <ulink url=" -#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " -#| "Distribution HOWTO</ulink> by V. Alex Brennen." msgid "" "For more background information you might want to review the <ulink url=" "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " @@ -5518,15 +5449,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 -#, fuzzy -#| msgid "" -#| "all files in <literal>Dir::Etc::Parts</literal> in 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> configuration list - in this case it will " -#| "be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " "order which have either no or \"<literal>conf</literal>\" as filename " @@ -6103,15 +6025,6 @@ msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:269 -#, fuzzy -#| msgid "" -#| "Minimum of seconds the Release file should be considered valid after it " -#| "was created (indicated by the <literal>Date</literal> header). Use this " -#| "if you need to use a seldomly updated (local) mirror of a more regular " -#| "updated archive with a <literal>Valid-Until</literal> header instead of " -#| "completely disabling the expiration date checking. Archive specific " -#| "settings can and should be used by appending the label of the archive to " -#| "the option name." msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " @@ -6120,14 +6033,13 @@ msgid "" "literal> which stands for \"for ever\". Archive specific settings can be " "made by appending the label of the archive to the option name." msgstr "" -"Minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet " -"werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile " -"<literal>Date</literal>). Benutzen Sie dies, falls Sie einen selten " -"aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten Archivs " -"mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt die " -"Überprüfung des Ablaufdatum komplett zu deaktivieren. Archivspezifische " -"Einstellungen können und sollten durch Anhängen des Archivetiketts an die " -"Option »name« vorgenommen werden." +"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem " +"sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</literal>). " +"Falls die Release-Datei selbst eine <literal>Valid-Until</literal>-Kopfzeile " +"enthält, wird das frühere der beiden Daten als Ablaufdatum verwandt. Vorgabe " +"ist <literal>0</literal>, was für »für immer« steht. Archivspezifische " +"Einstellungen können durch Anhängen des Archivetiketts an den Optionsnamen " +"vorgenommen werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:279 @@ -6170,14 +6082,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:294 -#, fuzzy -#| msgid "" -#| "Two sub-options to limit the use of PDiffs are also available: With " -#| "<literal>FileLimit</literal> can be specified how many PDiff files are " -#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the " -#| "other hand is the maximum percentage of the size of all patches compared " -#| "to the size of the targeted file. If one of these limits is exceeded the " -#| "complete file is downloaded instead of the patches." msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6629,18 +6533,6 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:459 -#, fuzzy -#| msgid "" -#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" -#| "replaceable></literal> will be checked: If this setting exists the method " -#| "will only be used if this file exists, e.g. for the bzip2 method (the " -#| "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -#| "also that list entries specified on the command line will be added at the " -#| "end of the list specified in the configuration files, but before the " -#| "default entries. To prefer a type in this case over the ones specified in " -#| "the configuration files you can set the option direct - not in list " -#| "style. This will not override the defined list, it will only prefix the " -#| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6667,12 +6559,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:466 -#, fuzzy -#| msgid "" -#| "The special type <literal>uncompressed</literal> can be used to give " -#| "uncompressed files a preference, but note that most archives don't " -#| "provide uncompressed files so this is mostly only useable for local " -#| "mirrors." msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -7960,16 +7846,6 @@ 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 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> 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 " @@ -8431,13 +8307,6 @@ msgstr "Reguläre Ausdrücke und glob()-Syntax" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:264 -#, fuzzy -#| 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)." msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " @@ -8466,11 +8335,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:279 -#, fuzzy -#| 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." 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 " @@ -9387,8 +9251,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, fuzzy, no-wrap -#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#, no-wrap msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]" @@ -9502,6 +9365,13 @@ msgid "" "and trusted context. <literal>trusted=no</literal> is the opposite which " "handles even correctly authenticated sources as not authenticated." msgstr "" +"<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass " +"Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die Datei " +"<filename>Release</filename> nicht signiert ist oder die Signatur nicht " +"geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte daher " +"nur in lokalem und vertrauenswürdigem Kontext benutzt werden. " +"<literal>trusted=no</literal> ist das Gegenteil davon. Es handhabt sogar " +"korrekt authentifizierte Quellen als nicht authentifiziert." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:128 @@ -11375,295 +11245,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." - -#~ msgid "" -#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " -#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" " -#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc " -#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></" -#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> " -#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</" -#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " -#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain" -#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " -#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </" -#~ "group>" -#~ msgstr "" -#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " -#~ "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></" -#~ "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></" -#~ "arg> <group choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" -#~ "replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</" -#~ "arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" -#~ "\"><replaceable>regulärer_Ausdruck</replaceable></arg></arg> <arg>show " -#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></" -#~ "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg>rdepends <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg>pkgnames <arg choice=\"plain\"><replaceable>Präfix</replaceable></" -#~ "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg>xvcg <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>Pakete</" -#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Pakete</replaceable></arg></arg> </group>" - -#~ msgid "" -#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " -#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></" -#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></" -#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> " -#~ "<group> <arg>add</arg> <arg>ident</arg> </group>" -#~ msgstr "" -#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " -#~ "<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></" -#~ "arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</" -#~ "replaceable></option></arg><arg><option>-c=<replaceable>Datei</" -#~ "replaceable></option></arg><group><arg>hinzufügen</" -#~ "arg><arg>Identifikation</arg></group>" - -#~ msgid "" -#~ "<command>apt-config</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" -#~ msgstr "" -#~ "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-" -#~ "o=<replaceable>Konfigurationszeichenkette</replaceable></option></" -#~ "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group " -#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" - -#~ msgid "" -#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></" -#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</" -#~ "replaceable></arg>" -#~ msgstr "" -#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-t=<replaceable>temporäres Verzeichnis</replaceable></" -#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</" -#~ "replaceable></arg>" - -#~ msgid "" -#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " -#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " -#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" -#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></" -#~ "option></arg> <arg><option>-o <replaceable>config</" -#~ "replaceable>=<replaceable>string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" -#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " -#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" -#~ "replaceable></arg><arg><replaceable>override</" -#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " -#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" -#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" -#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain" -#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" -#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " -#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" -#~ "group>" -#~ msgstr "" -#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " -#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " -#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" -#~ "arg> <arg><option>--arch <replaceable>Architektur</replaceable></option></" -#~ "arg> <arg><option>-o <replaceable>Konfiguration</" -#~ "replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</" -#~ "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> " -#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</" -#~ "replaceable></arg><arg><replaceable>überschreiben</" -#~ "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> " -#~ "<arg>contents <arg choice=\"plain\"><replaceable>Pfad</replaceable></" -#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>Pfad</" -#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain" -#~ "\"><replaceable>Konfigurationsdatei</replaceable></arg> <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Abschnitt</replaceable></arg></arg> " -#~ "<arg>clean <arg choice=\"plain\"><replaceable>Konfigurationsdatei</" -#~ "replaceable></arg></arg> </group>" - -#, fuzzy -#~| msgid "" -#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " -#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " -#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </" -#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> " -#~| "<replaceable>target_release</replaceable> </arg> </arg> <arg> <option>-" -#~| "a=</option> <arg choice='plain'> <replaceable>default_architecture</" -#~| "replaceable> </arg> </arg> <group choice=\"req\"> <arg " -#~| "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -#~| "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" -#~| "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" -#~| "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " -#~| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " -#~| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=" -#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" -#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " -#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> " -#~| "<arg> <group choice='req'> <arg choice='plain'> " -#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " -#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" -#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " -#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " -#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " -#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " -#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" -#~| "help</arg> </group> </arg> </group>" -#~ msgid "" -#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " -#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " -#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " -#~ "<arg> <option>-t=</option> <arg choice='plain'> " -#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice=" -#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" -#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" -#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" -#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " -#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " -#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain" -#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " -#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " -#~ "<group choice='req'> <arg choice='plain'> " -#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg " -#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " -#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " -#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " -#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " -#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" -#~ "help</arg> </group> </arg> </group>" -#~ msgstr "" -#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " -#~ "<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </" -#~ "option> </arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</" -#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg " -#~ "choice='plain'> <replaceable>Ziel-Release</replaceable> </arg> </arg> " -#~ "<arg> <option>-a=</option> <arg choice='plain'> " -#~ "<replaceable>Vorgabearchitektur</replaceable> </arg> </arg> <group choice=" -#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" -#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" -#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" -#~ "\"repeat\"><replaceable>Paket</replaceable> <arg> <group choice='req'> " -#~ "<arg choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </" -#~ "arg> <arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> " -#~ "</group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg " -#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg " -#~ "choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> " -#~ "<arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </" -#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " -#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " -#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " -#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " -#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" -#~ "help</arg> </group> </arg> </group>" - -#~ msgid "" -#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" -#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " -#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" -#~ "option></arg>" -#~ msgstr "" -#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>Dateiname</" -#~ "replaceable></option></arg> <arg><replaceable>Befehl</replaceable></arg> " -#~ "<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></" -#~ "option></arg>" - -#~ msgid "add <replaceable>filename</replaceable>" -#~ msgstr "add <replaceable>Dateiname</replaceable>" - -#~ msgid "del <replaceable>keyid</replaceable>" -#~ msgstr "del <replaceable>Schlüssel-ID</replaceable>" - -#~ msgid "export <replaceable>keyid</replaceable>" -#~ msgstr "export <replaceable>Schlüssel-ID</replaceable>" - -#~ msgid "--keyring <replaceable>filename</replaceable>" -#~ msgstr "--keyring <replaceable>Dateiname</replaceable>" - -#~ msgid "" -#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg " -#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </" -#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#~ "replaceable></arg> </arg> </group>" -#~ msgstr "" -#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-f=<replaceable>DATEINAME</replaceable></option></arg> " -#~ "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> " -#~ "<arg choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg " -#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </" -#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" -#~ "replaceable></arg> </arg> </group>" - -#~ msgid "" -#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " -#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg " -#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" -#~ msgstr "" -#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " -#~ "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></" -#~ "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></" -#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</" -#~ "replaceable></arg>" - -#, fuzzy -#~| msgid "" -#~| "Seconds the Release file should be considered valid after it was created " -#~| "(indicated by the <literal>Date</literal> header). If the Release file " -#~| "itself includes a <literal>Valid-Until</literal> header the earlier date " -#~| "of the two is used as the expiration date. The default value is " -#~| "<literal>0</literal> which stands for \"for ever\". Archive specific " -#~| "settings can be made by appending the label of the archive to the option " -#~| "name." -#~ msgid "" -#~ "Seconds the Release file should be considered valid after it was created. " -#~ "The default is \"for ever\" (0) if the Release file of the archive " -#~ "doesn't include a <literal>Valid-Until</literal> header. If it does then " -#~ "this date is the default. The date from the Release file or the date " -#~ "specified by the creation time of the Release file (<literal>Date</" -#~ "literal> header) plus the seconds specified with this options are used to " -#~ "check if the validation of a file has expired by using the earlier date " -#~ "of the two. Archive specific settings can be made by appending the label " -#~ "of the archive to the option name." -#~ msgstr "" -#~ "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, " -#~ "nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</" -#~ "literal>). Falls die Release-Datei selbst eine <literal>Valid-Until</" -#~ "literal>-Kopfzeile enhält, wird der frühere von beiden Terminen als " -#~ "Verfallsdatum benutzt. Vorgabewert ist <literal>0</literal>, was »für " -#~ "immer« bedeutet. Archivspezifische Einstellungen können durch Anhängen " -#~ "des Archivetiketts an die Option »name« vorgenommen werden." -- cgit v1.2.3 From 177645edb5775337ccf6d3971835a122b12318d4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 May 2012 23:07:30 +0200 Subject: * apt-pkg/packagemanager.cc: - do not run into loop on new-pre-depends-breaks (Closes: #673536) --- apt-pkg/packagemanager.cc | 2 +- debian/changelog | 2 ++ .../test-673536-pre-depends-breaks-loop | 23 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 test/integration/test-673536-pre-depends-breaks-loop diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 06151a165..46fc499c6 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -785,7 +785,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c VerIterator V(Cache,*I); PkgIterator P = V.ParentPkg(); // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers - if (P->CurrentVer == 0 || P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V)) + if (P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V)) continue; circle = true; break; diff --git a/debian/changelog b/debian/changelog index d419f9986..196b94c8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.9.4) UNRELEASED; urgency=low to get the correct section titles provided by docbook * doc/po/de.po: - updated german manpage translation by Chris Leick, thanks! + * apt-pkg/packagemanager.cc: + - do not run into loop on new-pre-depends-breaks (Closes: #673536) [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/test/integration/test-673536-pre-depends-breaks-loop b/test/integration/test-673536-pre-depends-breaks-loop new file mode 100755 index 000000000..e9d3c4de6 --- /dev/null +++ b/test/integration/test-673536-pre-depends-breaks-loop @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'native' + +buildsimplenativepackage 'basic' 'native' '1' 'stable' +buildsimplenativepackage 'basic' 'native' '2' 'unstable' 'Pre-Depends: common' +buildsimplenativepackage 'common' 'native' '2' 'unstable' 'Breaks: basic (<= 1)' + +setupaptarchive + +# we check with 'real' packages here as the simulation reports a 'Conf broken' +# which is technical correct for the simulation, but testing errormsg is ugly + +aptget install basic=1 -qq > /dev/null +testdpkginstalled basic +testdpkgnotinstalled common + +aptget dist-upgrade -qq > /dev/null +testdpkginstalled basic common -- cgit v1.2.3 From c086ac18511ce648a0ed88ab470965470bd422c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 20 May 2012 18:24:23 +0200 Subject: * doc/*.xml: - add a few translator notes and reword some paragraphs to ensure that translators and users alike can better understand them (Closes: #669409) --- debian/changelog | 3 + doc/apt-cache.8.xml | 28 +- doc/apt-config.8.xml | 7 +- doc/apt-get.8.xml | 7 +- doc/apt-key.8.xml | 8 +- doc/apt-verbatim.ent | 4 +- doc/apt.conf.5.xml | 38 +- doc/apt.ent | 14 +- doc/po/apt-doc.pot | 800 ++++++++++++++++++++------------------ doc/po/de.po | 1036 +++++++++++++++++++++++++++++--------------------- doc/po/es.po | 946 ++++++++++++++++++++++++++------------------- doc/po/fr.po | 948 ++++++++++++++++++++++++++------------------- doc/po/it.po | 810 ++++++++++++++++++++------------------- doc/po/ja.po | 924 +++++++++++++++++++++++++------------------- doc/po/pl.po | 865 ++++++++++++++++++++++------------------- doc/po/pt.po | 946 ++++++++++++++++++++++++++------------------- doc/po/pt_BR.po | 843 +++++++++++++++++++++------------------- 17 files changed, 4610 insertions(+), 3617 deletions(-) diff --git a/debian/changelog b/debian/changelog index 196b94c8e..c4bf881ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ apt (0.9.4) UNRELEASED; urgency=low - updated german manpage translation by Chris Leick, thanks! * apt-pkg/packagemanager.cc: - do not run into loop on new-pre-depends-breaks (Closes: #673536) + * doc/*.xml: + - add a few translator notes and reword some paragraphs to ensure that + translators and users alike can better understand them (Closes: #669409) [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 42d700c82..dd0ea6e9d 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -46,13 +46,11 @@ <variablelist> <varlistentry><term>gencaches</term> - <listitem><para><literal>gencaches</literal> performs the same operation as - <command>apt-get check</command>. It builds the source and package caches from - the sources in &sources-list; and from - <filename>/var/lib/dpkg/status</filename>.</para></listitem> + <listitem><para><literal>gencaches</literal> creates APT's package cache. This is done + implicitly by all commands needing this cache if it is missing or outdated.</para></listitem> </varlistentry> - <varlistentry><term>showpkg <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>showpkg <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>showpkg</literal> displays information about the packages listed on the command line. Remaining arguments are package names. The available versions and reverse dependencies of each package listed are listed, as @@ -141,7 +139,7 @@ Reverse Provides: </para></listitem> </varlistentry> - <varlistentry><term>showsrc <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>showsrc <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>showsrc</literal> displays all the source package records that match the given package names. All versions are shown, as well as all records that declare the name to be a Binary.</para></listitem> @@ -162,13 +160,13 @@ Reverse Provides: package cache.</para></listitem> </varlistentry> - <varlistentry><term>show <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>show <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>show</literal> performs a function similar to <command>dpkg --print-avail</command>; it displays the package records for the named packages.</para></listitem> </varlistentry> - <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term> + <varlistentry><term>search <replaceable>&synopsis-regex;</replaceable>…</term> <listitem><para><literal>search</literal> performs a full text search on all available package lists for the POSIX regex pattern given, see <citerefentry><refentrytitle><command>regex</command></refentrytitle> @@ -186,17 +184,17 @@ Reverse Provides: are and'ed together.</para></listitem> </varlistentry> - <varlistentry><term>depends <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>depends <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>depends</literal> shows a listing of each dependency a package has and all the possible other packages that can fulfill that dependency.</para></listitem> </varlistentry> - <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>rdepends <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a package has.</para></listitem> </varlistentry> - <varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term> + <varlistentry><term>pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]</term> <listitem><para>This command prints the name of each package APT knows. The optional argument is a prefix match to filter the name list. The output is suitable for use in a shell tab complete function and the output is generated @@ -207,7 +205,7 @@ Reverse Provides: </para></listitem> </varlistentry> - <varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>dotty <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>dotty</literal> takes a list of packages on the command line and generates output suitable for use by dotty from the <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink> @@ -225,19 +223,19 @@ Reverse Provides: <para>Caution, dotty cannot graph larger sets of packages.</para></listitem> </varlistentry> - <varlistentry><term>xvcg <replaceable>pkg(s)</replaceable></term> + <varlistentry><term>xvcg <replaceable>&synopsis-pkg;</replaceable></term> <listitem><para>The same as <literal>dotty</literal>, only for xvcg from the <ulink url="http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html">VCG tool</ulink>. </para></listitem></varlistentry> - <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term> + <varlistentry><term>policy [ <replaceable>&synopsis-pkg;</replaceable>… ]</term> <listitem><para><literal>policy</literal> is meant to help debug issues relating to the preferences file. With no arguments it will print out the priorities of each source. Otherwise it prints out detailed information about the priority selection of the named package.</para></listitem> </varlistentry> - <varlistentry><term>madison <replaceable>[ pkg(s) ]</replaceable></term> + <varlistentry><term>madison <replaceable>&synopsis-pkg;</replaceable>…</term> <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic the output format and a subset of the functionality of the Debian archive management tool, <literal>madison</literal>. It displays diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 94aeec059..0295cb193 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -93,9 +93,10 @@ eval $RES <varlistentry> <term><option>--format '<replaceable>%f "%v";%n</replaceable>'</option></term> - <listitem><para>Defines the output of each config option. %t will be replaced with the tagname, - %f with the complete tagname and %v with the value of the option. - Use uppercase letters and the respective values will be quoted. Additionally + <listitem><para>Defines the output of each config option. %t will be replaced with the name of the option, + %f with the complete optionname and %v with the value of the option. + Use uppercase letters and special characters in the value will be encoded to ensure that + it can e.g. be savely used in a quoted-string as defined by RFC822. Additionally %n will be replaced by a newline, %N by a tab. A % can be printed by using %%.</para></listitem> </varlistentry> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 65929e733..15b9701e2 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -397,9 +397,10 @@ </varlistentry> <varlistentry><term><option>--only-upgrade</option></term> - <listitem><para>Do not install new packages; When used in conjunction with <literal>install</literal>, - <literal>only-upgrade</literal> will prevent packages on the command line - from being upgraded if they are not already installed. + <listitem><para>Do not install new packages; When used in conjunction + with <literal>install</literal>, <literal>only-upgrade</literal> will + install upgrades for already installed packages only and ignore requests + to install new packages. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>.</para></listitem> </varlistentry> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 3748b5e17..a45ad8cd3 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -40,10 +40,10 @@ <varlistentry><term>add &synopsis-param-filename;</term> <listitem> <para> - - Add a new key to the list of trusted keys. The key is read - from &synopsis-param-filename;, or standard input if - &synopsis-param-filename; is <literal>-</literal>. + Add a new key to the list of trusted keys. + The key is read from the filename given with the parameter + &synopsis-param-filename; or if the filename is <literal>-</literal> + from standard input. </para> </listitem> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 3846c17e3..2f4bf063d 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -249,10 +249,10 @@ <arg choice='plain'>show &synopsis-arg-pkgver;</arg> <arg choice='plain'>depends &synopsis-arg-pkgver;</arg> <arg choice='plain'>rdepends &synopsis-arg-pkgver;</arg> - <arg choice='plain'>pkgnames <arg choice='plain'><replaceable>&synopsis-prefix;</replaceable></arg></arg> + <arg choice='plain'>pkgnames <arg><replaceable>&synopsis-prefix;</replaceable></arg></arg> <arg choice='plain'>dotty &synopsis-arg-pkgver;</arg> <arg choice='plain'>xvcg &synopsis-arg-pkgver;</arg> - <arg choice='plain'>policy &synopsis-arg-pkg;</arg> + <arg choice='plain'>policy <arg rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg></arg> <arg choice='plain'>madison &synopsis-arg-pkg;</arg> &synopsis-help; </group> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 2f95c1e52..ff9942e5f 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -127,14 +127,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>All of the APT tools take a -o option which allows an arbitrary configuration directive to be specified on the command line. The syntax is a full option name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals - sign then the new value of the option. Lists can be appended too by adding - a trailing :: to the list name. (As you might suspect: The scope syntax can't be used - on the command line.)</para> + sign then the new value of the option. To append a new element to a list, add a + trailing :: to the name of the list. (As you might suspect: The scope syntax can't + be used on the command line.)</para> <para>Note that you can use :: only for appending one item per line to a list and that you should not use it in combination with the scope syntax. (The scope syntax implicit insert ::) Using both syntaxes together will trigger a bug - which some users unfortunately relay on: An option with the unusual name "<literal>::</literal>" + which some users unfortunately depend on: An option with the unusual name "<literal>::</literal>" which acts like every other option with a name. These introduces many problems including that a user who writes multiple lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a list will gain the opposite as only the last assignment for this option @@ -155,8 +155,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> <varlistentry><term>Architectures</term> - <listitem><para>All Architectures the system supports. Processors implementing the <literal>amd64</literal> - are e.g. also able to execute binaries compiled for <literal>i386</literal>; This list is use when fetching files and + <listitem><para>All Architectures the system supports. Processors implementing the + <literal>amd64</literal> (also called <literal>x86-64</literal>) instruction set are + e.g. also able to execute binaries compiled for the <literal>i386</literal> + (<literal>x86</literal>) instruction set; This list is use when fetching files and parsing package lists. The internal default is always the native architecture (<literal>APT::Architecture</literal>) and all foreign architectures it can retrieve by calling <command>dpkg --print-foreign-architectures</command>. </para></listitem> @@ -216,10 +218,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <listitem><para>APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available' information. <literal>Cache-Start</literal> acts as a hint to which size the Cache will grow and is therefore the amount of memory APT will request at startup. The default value is - 20971520 bytes (~20 MB). Note that these amount of space need to be available for APT - otherwise it will likely fail ungracefully, so for memory restricted devices these value should - be lowered while on systems with a lot of configured sources this might be increased. - <literal>Cache-Grow</literal> defines in byte with the default of 1048576 (~1 MB) how much + 20971520 bytes (~20 MB). Note that this amount of space needs to be available for APT + otherwise it will likely fail ungracefully, so for memory restricted devices this value should + be lowered while on systems with a lot of configured sources it should be increased. + <literal>Cache-Grow</literal> defines in bytes with the default of 1048576 (~1 MB) how much the Cache size will be increased in the event the space defined by <literal>Cache-Start</literal> is not enough. These value will be applied again and again until either the cache is big enough to store all information or the size of the cache reaches the <literal>Cache-Limit</literal>. @@ -270,7 +272,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; it was created (indicated by the <literal>Date</literal> header). If the Release file itself includes a <literal>Valid-Until</literal> header the earlier date of the two is used as the expiration date. - The default value is <literal>0</literal> which stands for "for ever". + The default value is <literal>0</literal> which stands for "for ever valid". Archive specific settings can be made by appending the label of the archive to the option name. </para></listitem> @@ -293,7 +295,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; by default.</para> <para>Two sub-options to limit the use of PDiffs are also available: With <literal>FileLimit</literal> can be specified how many PDiff files - are downloaded at most to patch a file. <literal>SizeLimit</literal> + are downloaded at most to update a file. <literal>SizeLimit</literal> on the other hand is the maximum percentage of the size of all patches compared to the size of the targeted file. If one of these limits is exceeded the complete file is downloaded instead of the patches. @@ -347,6 +349,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers and proxies which choose to not conform to the HTTP/1.1 specification.</para> + <para><literal>Acquire::http::AllowRedirect</literal> controls if APT will follow + redirects, which is enabled by default.</para> + <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal> which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit @@ -493,7 +498,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; actually use them if the environment doesn't specify this languages. So the following example configuration will result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". - <programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para></listitem> + <programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para> + <para>Note: To prevent problems resulting from APT being executed in different environments + (e.g. by different users or by other programs) all Translation files which are found in + <filename>/var/lib/apt/lists/</filename> will be added to the end of the list + (after an implicit "<literal>none</literal>").</para> + </listitem> </varlistentry> </variablelist> @@ -505,7 +515,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The <literal>Dir::State</literal> section has directories that pertain to local state information. <literal>lists</literal> is the directory to place downloaded package lists in and <literal>status</literal> is the name of the dpkg status file. - <literal>preferences</literal> is the name of the APT preferences file. + <literal>preferences</literal> is the name of the APT <filename>preferences</filename> file. <literal>Dir::State</literal> contains the default directory to prefix on all sub items if they do not start with <filename>/</filename> or <filename>./</filename>.</para> diff --git a/doc/apt.ent b/doc/apt.ent index e48087fa7..2b014ef3c 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -119,7 +119,7 @@ <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term> <listitem><para>Storage area for package files in transit. - Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem> + Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem> </varlistentry> "> @@ -160,7 +160,7 @@ <varlistentry><term><filename>&statedir;/lists/partial/</filename></term> <listitem><para>Storage area for state information in transit. - Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> + Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem> </varlistentry> "> @@ -242,11 +242,17 @@ <!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY synopsis-filename "filename"> -<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive packages path override pathprefix --> +<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive packages path override-file pathprefix --> <!ENTITY synopsis-path "path"> + +<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive packages path override-file pathprefix --> +<!ENTITY synopsis-override "override-file"> + +<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "pathprefix"> + +<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive generate section --> <!ENTITY synopsis-section "section"> -<!ENTITY synopsis-override "override"> <!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export 473041FA --> <!ENTITY synopsis-keyid "keyid"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index ab1accaa6..e7e198d5a 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+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" @@ -331,8 +331,9 @@ msgid "" " " "<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit " -"partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> " +"(<filename>partial</filename> will be implicitly " +"appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -412,8 +413,9 @@ msgid "" " " "<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit " -"partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> " +"(<filename>partial</filename> will be implicitly " +"appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -590,18 +592,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> " -"<!ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -663,18 +686,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -688,7 +710,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -704,7 +726,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -716,26 +738,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -744,7 +766,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -755,7 +777,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -764,7 +786,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -774,7 +796,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -784,7 +806,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -794,19 +816,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -814,48 +836,48 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the " "cache. It is primarily for debugging." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg " "--print-avail</command>; it displays the package records for the named " @@ -863,12 +885,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -883,43 +905,43 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -929,7 +951,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -937,12 +959,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink " @@ -955,7 +977,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -964,17 +986,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink " "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG " @@ -982,12 +1004,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -996,12 +1018,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1013,22 +1035,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: " @@ -1036,17 +1058,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 apt-sortpkgs.1.xml:52 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1056,17 +1078,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1075,17 +1097,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1093,47 +1115,47 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -1143,34 +1165,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 apt-get.8.xml:369 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If " @@ -1181,17 +1203,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use " @@ -1200,29 +1222,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: " @@ -1230,12 +1252,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1243,12 +1265,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and " "<literal>rdepends</literal> to packages which are currently installed. " @@ -1256,37 +1278,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 sources.list.5.xml:255 msgid "See Also" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -1591,19 +1613,21 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using " +"%%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -1650,7 +1674,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "" @@ -2620,7 +2644,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:214 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 sources.list.5.xml:214 msgid "Examples" msgstr "" @@ -3293,18 +3317,19 @@ msgstr "" #: apt-get.8.xml:400 msgid "" "Do not install new packages; When used in conjunction with " -"<literal>install</literal>, <literal>only-upgrade</literal> will prevent " -"packages on the command line from being upgraded if they are not already " -"installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +"<literal>install</literal>, <literal>only-upgrade</literal> will install " +"upgrades for already installed packages only and ignore requests to install " +"new packages. Configuration Item: " +"<literal>APT::Get::Only-Upgrade</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -3314,12 +3339,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3332,12 +3357,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be " @@ -3347,24 +3372,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3375,17 +3400,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3400,12 +3425,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where " @@ -3415,24 +3440,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or " "<literal>remove</literal>, then this option acts like running " @@ -3441,12 +3466,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and " "<literal>build-dep</literal> commands. Indicates that the given source " @@ -3458,22 +3483,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, " @@ -3482,24 +3507,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: " @@ -3507,14 +3532,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, " @@ -3522,29 +3547,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "" @@ -3577,11 +3602,11 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 msgid "" -"Add a new key to the list of trusted keys. The key is read from " -"&synopsis-param-filename;, or standard input if &synopsis-param-filename; is " -"<literal>-</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -4351,8 +4376,8 @@ msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" @@ -4362,7 +4387,7 @@ msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a " "name. These introduces many problems including that a user who writes " "multiple lines in this <emphasis>wrong</emphasis> syntax in the hope to " @@ -4402,20 +4427,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the " +"<literal>i386</literal> (<literal>x86</literal>) instruction set; This list " +"is use when fetching files and parsing package lists. The internal default " +"is always the native architecture (<literal>APT::Architecture</literal>) " +"and all foreign architectures it can retrieve by calling <command>dpkg " +"--print-foreign-architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version " "available. Contains release name, codename or release version. Examples: " @@ -4424,24 +4451,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4450,12 +4477,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4488,12 +4515,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a " @@ -4504,25 +4531,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not " -"enough. These value will be applied again and again until either the cache " -"is big enough to store all information or the size of the cache reaches the " +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the " "<literal>Cache-Limit</literal>. The default of " "<literal>Cache-Limit</literal> is 0 which stands for no limit. If " "<literal>Cache-Grow</literal> is set to 0 the automatic grow of the cache is " @@ -4530,63 +4557,63 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -4598,29 +4625,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is " -"<literal>0</literal> which stands for \"for ever\". Archive specific " +"<literal>0</literal> which stands for \"for ever valid\". Archive specific " "settings can be made by appending the label of the archive to the option " "name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 msgid "Min-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -4631,35 +4658,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -4669,36 +4696,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4710,7 +4737,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4724,7 +4751,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4732,19 +4759,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:345 msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial " +"e.g. on high-latency connections. It specifies how many requests are send in " +"a pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the " +"ever-growing amount of webservers and proxies which choose to not conform to " +"the HTTP/1.1 specification." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -4754,7 +4788,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4762,12 +4796,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4777,7 +4811,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4799,12 +4833,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4824,7 +4858,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4834,7 +4868,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4844,7 +4878,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4854,18 +4888,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4878,12 +4912,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4891,12 +4925,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4904,7 +4938,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4916,19 +4950,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4945,13 +4979,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -4966,7 +5000,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4974,12 +5008,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4988,12 +5022,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -5006,13 +5040,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -5034,8 +5068,18 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit " +"\"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" " @@ -5043,24 +5087,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with " -"<filename>/</filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5073,7 +5117,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5083,7 +5127,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5091,7 +5135,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -5103,7 +5147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5116,7 +5160,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -5127,12 +5171,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5140,12 +5184,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5156,50 +5200,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5207,17 +5251,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5226,12 +5270,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5241,7 +5285,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5252,36 +5296,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -5296,7 +5340,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5306,7 +5350,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5320,12 +5364,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5337,12 +5381,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5359,12 +5403,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5376,12 +5420,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5391,12 +5435,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5408,12 +5452,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5425,7 +5469,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5439,12 +5483,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5453,12 +5497,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5469,7 +5513,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5477,7 +5521,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5485,7 +5529,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5495,110 +5539,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5606,92 +5650,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5701,12 +5745,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5724,90 +5768,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5815,32 +5859,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index a4ddf6a87..b0508e911 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.8.15-9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+0300\n" "PO-Revision-Date: 2011-11-13 11:21+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -428,11 +428,17 @@ msgstr "" #. type: Plain text #: apt.ent:125 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +#| " <listitem><para>Storage area for package files in transit.\n" +#| " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -533,11 +539,17 @@ msgstr "" #. type: Plain text #: apt.ent:166 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +#| " <listitem><para>Storage area for state information in transit.\n" +#| " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -732,20 +744,44 @@ msgid "" "synopsis-filename \"filename\">" msgstr "<!ENTITY synopsis-filename \"Dateiname\">" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "<!ENTITY synopsis-path \"Pfad\">" + #. type: Plain text #: apt.ent:250 +#, fuzzy +#| msgid "" +#| "<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-" +#| "ftparchive packages path override-file pathprefix --> <!ENTITY synopsis-" +#| "override \"override\">" msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" -msgstr "<!ENTITY synopsis-path \"Pfad\"> <!ENTITY synopsis-pathprefix \"Pfadpräfix\"> " -"<!ENTITY synopsis-section \"Abschnitt\"><!ENTITY synopsis-override " -"\"außer_Kraft_setzen\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" +msgstr "<!ENTITY synopsis-override \"außer_Kraft_setzen\">" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "<!ENTITY synopsis-pathprefix \"Pfadpräfix\">" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "<!ENTITY synopsis-section \"Abschnitt\">" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">" @@ -824,22 +860,19 @@ msgstr "gencaches" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -"<literal>gencaches</literal> führt die gleichen Operationen wie <command>apt-" -"get check</command> durch. Es bildet die Quellen- und Paketzwischenspeicher " -"aus den Quellen in &sources-list; und von <filename>/var/lib/dpkg/status</" -"filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +#| msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showpkg <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -863,7 +896,7 @@ msgstr "" "Ausgabe ähnlich der folgenden erzeugen:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -889,7 +922,7 @@ msgstr "" "Reverse Provides: \n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -907,12 +940,12 @@ msgstr "" "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "stats" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" @@ -921,7 +954,7 @@ msgstr "" "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." @@ -930,7 +963,7 @@ msgstr "" "Zwischenspeicher gefundenen Pakete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -944,7 +977,7 @@ msgstr "" "Kategorie." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -961,7 +994,7 @@ msgstr "" "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -974,7 +1007,7 @@ msgstr "" "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -987,7 +1020,7 @@ msgstr "" "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1003,7 +1036,7 @@ msgstr "" "Breaks-Angaben Bezug genommen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1019,7 +1052,7 @@ msgstr "" "sein." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." @@ -1028,12 +1061,14 @@ msgstr "" "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +#| msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showsrc <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -1044,12 +1079,12 @@ msgstr "" "wie alle Datensätze, die den Namen für ein Programm deklarieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "dump" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1058,12 +1093,12 @@ msgstr "" "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "dumpavail" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." @@ -1073,12 +1108,12 @@ msgstr "" "benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "unmet" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1087,12 +1122,14 @@ msgstr "" "Abhängigkeiten im Paketzwischenspeicher." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +#| msgid "show <replaceable>pkg(s)</replaceable>" +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "show <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." @@ -1102,12 +1139,14 @@ msgstr "" "Pakete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +#| msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "search <replaceable>regex [ regex … ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1132,7 +1171,7 @@ msgstr "" "Beschreibung nicht durchsucht, sondern nur der Paketname." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." @@ -1141,12 +1180,14 @@ msgstr "" "die »und«-verknüpft werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +#| msgid "depends <replaceable>pkg(s)</replaceable>" +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "depends <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." @@ -1156,12 +1197,14 @@ msgstr "" "können." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +#, fuzzy +#| msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "rdepends <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." @@ -1170,12 +1213,14 @@ msgstr "" "Rückwärtsabhängigkeit, die ein Paket hat." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "pkgnames <replaceable>[ Präfix ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1190,7 +1235,7 @@ msgstr "" "besten mit der <option>--generate</option>-Option benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1201,12 +1246,14 @@ msgstr "" "Pakete sind z.B. auch in der generierten Liste aufgeführt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +#| msgid "dotty <replaceable>pkg(s)</replaceable>" +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "dotty <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1228,7 +1275,7 @@ msgstr "" "GivenOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1242,19 +1289,21 @@ msgstr "" "depends, grüne Linien sind Konflikte." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch " "darstellen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +#| msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "xvcg <replaceable>Paket(e)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." @@ -1264,12 +1313,14 @@ msgstr "" "ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "policy <replaceable>[ Paket(e) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1282,12 +1333,14 @@ msgstr "" "Informationen über die Prioritätenauswahl der genannten Pakete aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +#, fuzzy +#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "madison <replaceable>[ Paket(e) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1306,24 +1359,24 @@ msgstr "" "(<literal>APT::Architecture</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" -msgstr "Optionen" +msgstr "options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1335,18 +1388,18 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1363,17 +1416,17 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1387,17 +1440,17 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "<option>--important</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1408,47 +1461,47 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "<option>--no-pre-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "<option>--no-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "<option>--no-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "<option>--no-conflicts</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "<option>--no-breaks</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "<option>--no-replaces</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -1464,17 +1517,17 @@ msgstr "" "Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "<option>--full</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1483,18 +1536,18 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1511,17 +1564,17 @@ msgstr "" "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1533,17 +1586,17 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "<option>-n</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1552,12 +1605,12 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1568,12 +1621,12 @@ msgstr "" "<literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1584,12 +1637,12 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1600,46 +1653,46 @@ msgstr "" "<literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "Dateien" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnose" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -1995,7 +2048,6 @@ msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:89 -#| msgid "<option>-y</option>" msgid "<option>--empty</option>" msgstr "<option>-empty</option>" @@ -2019,28 +2071,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:96 +#, fuzzy +#| msgid "" +#| "Defines the output of each config option. %t will be replaced with " +#| "the tagname, %f with the complete tagname and %v with the " +#| "value of the option. Use uppercase letters and the respective values " +#| "will be quoted. Additionally %n will be replaced by a newline, " +#| "%N by a tab. A % can be printed by using %%." msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." -msgstr "" -"definiert die Ausgabe jeder Option. %t wird durch den Markierungsnamen " -"ersetzt, %f durch den kompletten Markierungsnamen und %v durch " -"den Wert der Option. Benutzen Sie großgeschriebene Buchstaben, damit die " -"jeweiligen Werte in Anführungszeichen gesetzt werden. %n wird " -"zusätzlich durch einen Zeilenumbruch ersetzt, %N durch einen " -"Tabulator. Ein % kann mittels %% ausgegeben werden." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." +msgstr "" +"definiert die Ausgabe jeder Option. %t wird durch den " +"Markierungsnamen ersetzt, %f durch den kompletten Markierungsnamen " +"und %v durch den Wert der Option. Benutzen Sie großgeschriebene " +"Buchstaben, damit die jeweiligen Werte in Anführungszeichen gesetzt werden. " +"%n wird zusätzlich durch einen Zeilenumbruch ersetzt, %N durch " +"einen Tabulator. Ein % kann mittels %% ausgegeben " +"werden." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -2101,7 +2163,7 @@ msgstr "" "XXXX</filename> angegeben wurde" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -3337,7 +3399,7 @@ msgstr "" "werden kann." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "Beispiele" @@ -3727,7 +3789,7 @@ msgstr "" "Gleichheitszeichens vor den Paketnamen und dann der Version zum " "Herunterladen erhalten werde, ähnlich dem Mechanismus, der für Paketdateien " "benutzt wird. Dies ermöglicht exakte Übereinstimmung von Quellpaketname und -" -"Version und impliziert das Einschalten der<literal>APT::Get::Only-Source</" +"Version und impliziert das Einschalten der <literal>APT::Get::Only-Source</" "literal>-Option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4115,8 +4177,8 @@ msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." msgstr "" -"automatisches »nein« auf alle Anfragen. Konfigurationselement: " -"<literal>APT::Get::Assume-No</literal>." +"automatisches »nein« auf alle Anfragen. Konfigurationselement: <literal>APT::" +"Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:358 @@ -4249,10 +4311,16 @@ msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:400 +#, fuzzy +#| msgid "" +#| "Do not install new packages; When used in conjunction with " +#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent " +#| "packages on the command line from being upgraded if they are not already " +#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" "Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</" @@ -4262,12 +4330,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4282,12 +4350,12 @@ msgstr "" "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4309,12 +4377,12 @@ msgstr "" "Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4327,12 +4395,12 @@ msgstr "" "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4341,12 +4409,12 @@ msgstr "" "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4364,17 +4432,17 @@ msgstr "" "Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4399,12 +4467,12 @@ msgstr "" "auch die &apt-preferences;-Handbuchseite." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4418,12 +4486,12 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4432,12 +4500,12 @@ msgstr "" "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4451,12 +4519,12 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4475,22 +4543,22 @@ msgstr "" "Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4502,12 +4570,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4516,12 +4584,12 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4532,7 +4600,7 @@ msgstr "" "<literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4541,7 +4609,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4552,7 +4620,7 @@ msgstr "" "preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4561,22 +4629,22 @@ msgstr "" "100 bei Fehlern." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "ORIGINALAUTOREN" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "AKTUELLE AUTOREN" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4613,11 +4681,16 @@ msgid "add &synopsis-param-filename;" msgstr "add &synopsis-param-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 +#, fuzzy +#| msgid "" +#| "Add a new key to the list of trusted keys. The key is read from " +#| "&synopsis-param-filename;, or standard input if &synopsis-param-filename; " +#| "is <literal>-</literal>." msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" "Einen neuen Schlüssel zur Liste der vertrauenswürdigen Schlüssel hinzufügen. " "Der Schlüssel wird aus <replaceable>Dateiname</replaceable> gelesen oder, " @@ -4643,8 +4716,7 @@ msgstr "export &synopsis-param-keyid;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:67 msgid "Output the key &synopsis-param-keyid; to standard output." -msgstr "" -"Den Schlüssel &synopsis-param-keyid; auf der Standardausgabe ausgeben." +msgstr "Den Schlüssel &synopsis-param-keyid; auf der Standardausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:74 @@ -5644,12 +5716,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:127 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name. (As " +#| "you might suspect: The scope syntax can't be used on the command line.)" msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" "Alle APT-Werkzeuge bringen eine Option -o mit, die es einer beliebigen " @@ -5663,11 +5743,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:134 +#, fuzzy +#| msgid "" +#| "Note that you can use :: only for appending one item per line to a list " +#| "and that you should not use it in combination with the scope syntax. " +#| "(The scope syntax implicit insert ::) Using both syntaxes together will " +#| "trigger a bug which some users unfortunately relay on: An option with the " +#| "unusual name \"<literal>::</literal>\" which acts like every other option " +#| "with a name. These introduces many problems including that a user who " +#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the " +#| "hope to append to a list will gain the opposite as only the last " +#| "assignment for this option \"<literal>::</literal>\" will be used. " +#| "Upcoming APT versions will raise errors and will stop working if they " +#| "encounter this misuse, so please correct such statements now as long as " +#| "APT doesn't complain explicit about them." msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -5724,13 +5818,24 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:158 +#, fuzzy +#| msgid "" +#| "All Architectures the system supports. Processors implementing the " +#| "<literal>amd64</literal> are e.g. also able to execute binaries compiled " +#| "for <literal>i386</literal>; This list is use when fetching files and " +#| "parsing package lists. The internal default is always the native " +#| "architecture (<literal>APT::Architecture</literal>) and all foreign " +#| "architectures it can retrieve by calling <command>dpkg --print-foreign-" +#| "architectures</command>." msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" "Alle Architekturen, die das System unterstützt. Prozessoren, die " "<literal>amd64</literal> implementieren sind beispielsweise ebenso in der " @@ -5742,12 +5847,12 @@ msgstr "" "abgefragt werden können." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5760,12 +5865,12 @@ msgstr "" "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5774,12 +5879,12 @@ msgstr "" "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5794,12 +5899,12 @@ msgstr "" "Möglichkeiten bereitstellt, um sie erneut zu installieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5867,12 +5972,12 @@ msgstr "" "Upgrade-Prozesses arbeiten kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5890,28 +5995,46 @@ msgstr "" "bash oder etwas, was davon abhängt, sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow und Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 +#, fuzzy +#| msgid "" +#| "APT uses since version 0.7.26 a resizable memory mapped cache file to " +#| "store the 'available' information. <literal>Cache-Start</literal> acts as " +#| "a hint to which size the Cache will grow and is therefore the amount of " +#| "memory APT will request at startup. The default value is 20971520 bytes " +#| "(~20 MB). Note that these amount of space need to be available for APT " +#| "otherwise it will likely fail ungracefully, so for memory restricted " +#| "devices these value should be lowered while on systems with a lot of " +#| "configured sources this might be increased. <literal>Cache-Grow</" +#| "literal> defines in byte with the default of 1048576 (~1 MB) how much the " +#| "Cache size will be increased in the event the space defined by " +#| "<literal>Cache-Start</literal> is not enough. These value will be applied " +#| "again and again until either the cache is big enough to store all " +#| "information or the size of the cache reaches the <literal>Cache-Limit</" +#| "literal>. The default of <literal>Cache-Limit</literal> is 0 which " +#| "stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +#| "automatic grow of the cache is disabled." msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" "APT benutzt seit Version 0.7.26 eine Zwischenspeicherdatei für " "Speicherabbilder mit veränderlicher Größe um »verfügbare« Informationen zu " @@ -5932,24 +6055,24 @@ msgstr "" "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet " "werde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5959,12 +6082,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -5974,12 +6097,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "CD-ROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -5989,17 +6112,17 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "Die Erwerbgruppe" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6019,19 +6142,28 @@ msgstr "" "gewollt ist, kann die Option <literal>Max-ValidTime</literal> benutzt werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created " +#| "(indicated by the <literal>Date</literal> header). If the Release file " +#| "itself includes a <literal>Valid-Until</literal> header the earlier date " +#| "of the two is used as the expiration date. The default value is " +#| "<literal>0</literal> which stands for \"for ever\". Archive specific " +#| "settings can be made by appending the label of the archive to the option " +#| "name." msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem " "sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</literal>). " @@ -6042,12 +6174,12 @@ msgstr "" "vorgenommen werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 msgid "Min-ValidTime" msgstr "Min-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -6066,12 +6198,12 @@ msgstr "" "Option »name« vorgenommen werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6081,11 +6213,19 @@ msgstr "" "True." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 +#, fuzzy +#| msgid "" +#| "Two sub-options to limit the use of PDiffs are also available: With " +#| "<literal>FileLimit</literal> can be specified how many PDiff files are " +#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +#| "other hand is the maximum percentage of the size of all patches compared " +#| "to the size of the targeted file. If one of these limits is exceeded the " +#| "complete file is downloaded instead of the patches." msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." @@ -6099,12 +6239,12 @@ msgstr "" "der Patche heruntergeladen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6120,12 +6260,12 @@ msgstr "" "URI-Art geöffnet wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6134,12 +6274,12 @@ msgstr "" "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6149,12 +6289,12 @@ msgstr "" "kopiert zu werden. True ist die Vorgabe." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6172,7 +6312,7 @@ msgstr "" "die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6198,7 +6338,7 @@ msgstr "" "unterstützt keine dieser Optionen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6209,27 +6349,26 @@ msgstr "" "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 -msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." -msgstr "" -"Eine Einstellung wird bereitgestellt, um die Tiefe der Warteschlange in " -"Fällen zu steuern, in denen der andere Server nicht RFC-konform oder " -"fehlerhaft (so wie Squid 2.0.2) ist. <literal>Acquire::http::Pipeline-Depth</" -"literal> kann ein Wert von 0 bis 5 sein, der anzeigt, wie viele ausstehende " -"Anfragen APT senden soll. Ein Wert von Null MUSS angegeben werden, falls der " -"andere Server nicht ordnungsgemäß auf TCP-Verbindungen wartet – anderenfalls " -"werden fehlerhafte Daten erscheinen. Rechner, die dies erfordern, verstoßen " -"gegen RFC 2068." +#: apt.conf.5.xml:345 +msgid "" +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6245,7 +6384,7 @@ msgstr "" "deaktiviert.)" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6257,12 +6396,12 @@ msgstr "" "bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6277,7 +6416,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6316,12 +6455,12 @@ msgstr "" "SslForceVersion</literal> ist die entsprechende per-Host-Option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6340,7 +6479,7 @@ msgid "" msgstr "" "FTP-URIs; ftp::Proxy ist der zu benutzende Standard-FTP-Proxy. Er wird " "standardmäßig in der Form <literal>ftp://[[Anwender][:Passwort]@]Host[:Port]/" -"</literal> angegeben. pro-Host-Proxys kann außerdem in der Form " +"</literal> angegeben. per-Host-Proxys kann außerdem in der Form " "<literal>ftp::Proxy::<host></literal> angegeben werden. Hierbei " "bedeutet das spezielle Schlüsselwort <literal>DIRECT</literal>, dass keine " "Proxys benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, " @@ -6356,7 +6495,7 @@ msgstr "" "entsprechenden URI-Bestandteil genommen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6373,7 +6512,7 @@ msgstr "" "Beispielskonfiguration, um Beispiele zu erhalten)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6387,7 +6526,7 @@ msgstr "" "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6403,18 +6542,18 @@ msgstr "" "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6436,12 +6575,12 @@ msgstr "" "können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6452,18 +6591,18 @@ msgstr "" "Zusätzliche Parameter werden an gpgv weitergeleitet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6473,9 +6612,9 @@ msgid "" "the fly or the used method can be changed. The syntax for this is: " "<placeholder type=\"synopsis\" id=\"0\"/>" msgstr "" -"Die List der Kompressionstypen die von den »aquire«-Methoden verstanden " +"Die List der Kompressionstypen die von den »acquire«-Methoden verstanden " "werden. Dateien wie <filename>Packages</filename> können in verschiedenen " -"Kompressionsformaten verfügbar sein. Standardmäßig können die »aquire«-" +"Kompressionsformaten verfügbar sein. Standardmäßig können die »acquire«-" "Methoden <command>bzip2</command>-, <command>lzma</command>- und " "<command>gzip</command>-komprimierte Dateien dekomprimieren. Mit dieser " "Einstellung können spontan weiter Formate hinzugefügt oder die benutzte " @@ -6483,19 +6622,19 @@ msgstr "" "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6511,8 +6650,8 @@ msgid "" "<literal>bz2</literal> explicit to the list as it will be added automatic." msgstr "" "Außerdem kann die Untergruppe <literal>Order</literal> benutzt werden, um zu " -"definieren, in welcher Reihenfolge das »aquire«-System die komprimierten " -"Dateien herunterzuladen versucht. Das »aquire«-System wird die erste " +"definieren, in welcher Reihenfolge das »acquire«-System die komprimierten " +"Dateien herunterzuladen versucht. Das »acquire«-System wird die erste " "versuchen und mit dem nächsten Kompressionstyp in dieser Liste bei einem " "Fehler fortfahren. Um daher einen nach dem anderen Typ vorzuziehen, fügen " "Sie einfach den bevorzugten Typ zuerst in die Liste – noch nicht " @@ -6526,13 +6665,13 @@ msgstr "" "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6558,7 +6697,7 @@ msgstr "" "wird diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6570,12 +6709,12 @@ msgstr "" "dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6589,12 +6728,12 @@ msgstr "" "False." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6616,13 +6755,13 @@ msgstr "" "hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6663,8 +6802,17 @@ msgstr "" "französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre die " "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6674,20 +6822,29 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 +#, fuzzy +#| msgid "" +#| "The <literal>Dir::State</literal> section has directories that pertain to " +#| "local state information. <literal>lists</literal> is the directory to " +#| "place downloaded package lists in and <literal>status</literal> is the " +#| "name of the dpkg status file. <literal>preferences</literal> is the name " +#| "of the APT preferences file. <literal>Dir::State</literal> contains the " +#| "default directory to prefix on all sub items if they do not start with " +#| "<filename>/</filename> or <filename>./</filename>." msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" "Der <literal>Dir::State</literal>-Abschnitt hat Verzeichnisse, die zu " "lokalen Statusinformationen gehören. <literal>lists</literal> ist das " @@ -6699,7 +6856,7 @@ msgstr "" "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6722,7 +6879,7 @@ msgstr "" "in <literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6737,7 +6894,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6749,7 +6906,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6767,7 +6924,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6787,7 +6944,7 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6805,12 +6962,12 @@ msgstr "" "verwandt werden." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6821,12 +6978,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6844,7 +7001,7 @@ msgstr "" "führt diese Aktion vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6853,12 +7010,12 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6867,12 +7024,12 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6881,12 +7038,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6895,7 +7052,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6906,17 +7063,17 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6930,12 +7087,12 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6952,7 +7109,7 @@ msgstr "" "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6968,12 +7125,12 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6982,12 +7139,12 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6997,12 +7154,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7029,7 +7186,7 @@ msgstr "" "konfiguriert werden." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7043,7 +7200,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7068,12 +7225,12 @@ msgstr "" "wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7094,12 +7251,12 @@ msgstr "" "außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7128,12 +7285,12 @@ msgstr "" "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7152,12 +7309,12 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7173,12 +7330,12 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7197,12 +7354,12 @@ msgstr "" "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7220,7 +7377,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7244,12 +7401,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7263,12 +7420,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7286,7 +7443,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7297,7 +7454,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7308,7 +7465,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7320,7 +7477,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7329,17 +7486,17 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7347,48 +7504,48 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7397,12 +7554,12 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7411,23 +7568,23 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7436,12 +7593,12 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7452,12 +7609,12 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7467,24 +7624,24 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Protokollieren, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7493,12 +7650,12 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7507,12 +7664,12 @@ msgstr "" "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7522,12 +7679,12 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7535,12 +7692,12 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7550,12 +7707,12 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7571,12 +7728,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7608,23 +7765,23 @@ msgstr "" "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7634,12 +7791,12 @@ msgstr "" "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7648,12 +7805,12 @@ msgstr "" "alle während deren Auswertung gefundenen Fehler ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7663,12 +7820,12 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7676,22 +7833,22 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "Die Priorität jeder Paketliste beim Start ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7701,12 +7858,12 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7718,12 +7875,12 @@ msgstr "" "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7732,7 +7889,7 @@ msgstr "" "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7741,13 +7898,13 @@ msgstr "" "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9368,8 +9525,8 @@ msgstr "" "<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass " "Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die Datei " "<filename>Release</filename> nicht signiert ist oder die Signatur nicht " -"geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte daher " -"nur in lokalem und vertrauenswürdigem Kontext benutzt werden. " +"geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte " +"daher nur in lokalem und vertrauenswürdigem Kontext benutzt werden. " "<literal>trusted=no</literal> ist das Gegenteil davon. Es handhabt sogar " "korrekt authentifizierte Quellen als nicht authentifiziert." @@ -11245,3 +11402,32 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." + +#~ msgid "" +#~ "<literal>gencaches</literal> performs the same operation as <command>apt-" +#~ "get check</command>. It builds the source and package caches from the " +#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</" +#~ "filename>." +#~ msgstr "" +#~ "<literal>gencaches</literal> führt die gleichen Operationen wie " +#~ "<command>apt-get check</command> durch. Es bildet die Quellen- und " +#~ "Paketzwischenspeicher aus den Quellen in &sources-list; und von " +#~ "<filename>/var/lib/dpkg/status</filename>." + +#~ msgid "" +#~ "One setting is provided to control the pipeline depth in cases where the " +#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " +#~ "5 indicating how many outstanding requests APT should send. A value of " +#~ "zero MUST be specified if the remote host does not properly linger on TCP " +#~ "connections - otherwise data corruption will occur. Hosts which require " +#~ "this are in violation of RFC 2068." +#~ msgstr "" +#~ "Eine Einstellung wird bereitgestellt, um die Tiefe der Warteschlange in " +#~ "Fällen zu steuern, in denen der andere Server nicht RFC-konform oder " +#~ "fehlerhaft (so wie Squid 2.0.2) ist. <literal>Acquire::http::Pipeline-" +#~ "Depth</literal> kann ein Wert von 0 bis 5 sein, der anzeigt, wie viele " +#~ "ausstehende Anfragen APT senden soll. Ein Wert von Null MUSS angegeben " +#~ "werden, falls der andere Server nicht ordnungsgemäß auf TCP-Verbindungen " +#~ "wartet – anderenfalls werden fehlerhafte Daten erscheinen. Rechner, die " +#~ "dies erfordern, verstoßen gegen RFC 2068." diff --git a/doc/po/es.po b/doc/po/es.po index d92602ae4..c4a6b44a4 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+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" @@ -463,11 +463,17 @@ msgstr "" #. type: Plain text #: apt.ent:125 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +#| " <listitem><para>Storage area for package files in transit.\n" +#| " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -568,11 +574,17 @@ msgstr "" #. type: Plain text #: apt.ent:166 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +#| " <listitem><para>Storage area for state information in transit.\n" +#| " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -779,18 +791,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -873,22 +906,19 @@ msgstr "gencaches" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -"<literal>gencaches</literal> realiza la misma operación que <command>apt-get " -"check</command>. Genera las caches de los paquetes fuente y de los paquetes " -"binarios a partir de la lista de fuentes en &sources-list; y a partir de " -"<filename>/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +#| msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showpkg <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -912,7 +942,7 @@ msgstr "" "siguiente:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -938,7 +968,7 @@ msgstr "" "Reverse Provides: \n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -957,12 +987,12 @@ msgstr "" "salida lo mejor es consultar el código fuente de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "stats" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" @@ -971,7 +1001,7 @@ msgstr "" "necesita ningún argumento adicional. Las estadísticas que muestra son:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." @@ -980,7 +1010,7 @@ msgstr "" "encontrados en la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -993,7 +1023,7 @@ msgstr "" "dependencias. La mayoría de los paquetes pertenecen a este grupo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -1011,7 +1041,7 @@ msgstr "" "agent»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -1024,7 +1054,7 @@ msgstr "" "pero sólo un paquete, xless, proporciona «X11-text-viewer»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -1038,7 +1068,7 @@ msgstr "" "paquete debconf-tiny." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1054,7 +1084,7 @@ msgstr "" "«Conflicts» o «Breaks» de la descripción de los paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1069,7 +1099,7 @@ msgstr "" "valor puede ser considerablemente mayor que el número total de paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." @@ -1078,12 +1108,14 @@ msgstr "" "dependencia de todos los paquetes de la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +#| msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showsrc <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -1095,12 +1127,12 @@ msgstr "" "son binarios." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "dump" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1109,12 +1141,12 @@ msgstr "" "la caché. Fundamentalmente para depuración." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "dumpavail" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." @@ -1124,12 +1156,12 @@ msgstr "" "además, la usa el método &dselect;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "unmet" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1138,12 +1170,14 @@ msgstr "" "satisfechas en la caché de paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +#| msgid "show <replaceable>pkg(s)</replaceable>" +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "show <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." @@ -1152,12 +1186,14 @@ msgstr "" "avail</command>, muestra los campos del paquete para los paquetes nombrados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +#| msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "search <replaceable>exp-regular [exp-regular ...]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1182,7 +1218,7 @@ msgstr "" "sólo se busca en el nombre de los paquetes, no en la descripción larga." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." @@ -1191,12 +1227,14 @@ msgstr "" "búsqueda que se juntarán mediante una «Y lógica»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +#| msgid "depends <replaceable>pkg(s)</replaceable>" +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "depends <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." @@ -1205,12 +1243,14 @@ msgstr "" "paquete y de todos los demás paquetes que la pueden satisfacer." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +#, fuzzy +#| msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "rdepends <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." @@ -1218,12 +1258,14 @@ msgstr "" "<literal>rdepends</literal> muestra las dependencias inversas de un paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "pkgnames <replaceable>[ prefijo ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1239,7 +1281,7 @@ msgstr "" "generate</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1250,12 +1292,14 @@ msgstr "" "virtuales también aparecen en la lista generada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +#| msgid "dotty <replaceable>pkg(s)</replaceable>" +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "dotty <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1276,7 +1320,7 @@ msgstr "" "active la opción <literal>APT::Cache::GivenOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1291,17 +1335,19 @@ msgstr "" "líneas verdes son conflictos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +#| msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "xvcg <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." @@ -1311,12 +1357,14 @@ msgstr "" "ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "policy <replaceable>[ paquete(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1329,12 +1377,14 @@ msgstr "" "detallada acerca de la prioridad de selección del paquete nombrado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +#, fuzzy +#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "madison <replaceable>[ paquete(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1353,24 +1403,24 @@ msgstr "" "paquetes (<literal>APT::Architecture</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1381,18 +1431,18 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1407,17 +1457,17 @@ msgstr "" "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1431,17 +1481,17 @@ msgstr "" "configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "<option>--important</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1452,47 +1502,47 @@ msgstr "" "configuración: <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "<option>--no-pre-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "<option>--no-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "<option>--no-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "<option>--no-conflicts</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "<option>--no-breaks</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "<option>--no-replaces</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 #, fuzzy #| msgid "" #| "Per default the <literal>depends</literal> and <literal>rdepends</" @@ -1515,17 +1565,17 @@ msgstr "" "<literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "<option>--full</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1534,18 +1584,18 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1562,17 +1612,17 @@ msgstr "" "configuración: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1584,17 +1634,17 @@ msgstr "" "Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "<option>-n</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1603,12 +1653,12 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1619,12 +1669,12 @@ msgstr "" "configuración: <literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1635,12 +1685,12 @@ msgstr "" "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1651,46 +1701,46 @@ msgstr "" "Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "Véase también" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnósticos" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -2072,20 +2122,22 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -2145,7 +2197,7 @@ msgstr "" "<filename>paquete.config.XXXX</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -3378,7 +3430,7 @@ msgstr "" "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "Ejemplos" @@ -4290,10 +4342,16 @@ msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:400 +#, fuzzy +#| msgid "" +#| "Do not install new packages; When used in conjunction with " +#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent " +#| "packages on the command line from being upgraded if they are not already " +#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" "No instala paquetes nuevos. Cuando se usa junto a <literal>install</" @@ -4302,12 +4360,12 @@ msgstr "" "de configuración: <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4323,12 +4381,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4350,12 +4408,12 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4369,12 +4427,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4384,12 +4442,12 @@ msgstr "" "ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4407,17 +4465,17 @@ msgstr "" "<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4441,12 +4499,12 @@ msgstr "" "también la página del manual de &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4460,12 +4518,12 @@ msgstr "" "<literal>APT::Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4474,12 +4532,12 @@ msgstr "" "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4492,12 +4550,12 @@ msgstr "" "configuración: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4517,22 +4575,22 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4543,12 +4601,12 @@ msgstr "" "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4557,12 +4615,12 @@ msgstr "" "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4573,7 +4631,7 @@ msgstr "" "configuración: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4582,7 +4640,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4593,7 +4651,7 @@ msgstr "" "preferences;, el Cómo de APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4602,22 +4660,22 @@ msgstr "" "100 en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "AUTORES ORIGINALES" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "AUTORES ACTUALES" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4653,16 +4711,16 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 #, fuzzy #| msgid "" #| "Add a new key to the list of trusted keys. The key is read from " #| "<replaceable>filename</replaceable>, or standard input if " #| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" "Añade una nueva clave a la lista de claves de confianza. Puede introducir la " "clave mediante un fichero (<replaceable>nombre-de-fichero</replaceable>) o " @@ -5723,12 +5781,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:127 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name. (As " +#| "you might suspect: The scope syntax can't be used on the command line.)" msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" "Todas las herramientas de APT permiten la opción -o como una directriz " @@ -5741,11 +5807,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:134 +#, fuzzy +#| msgid "" +#| "Note that you can use :: only for appending one item per line to a list " +#| "and that you should not use it in combination with the scope syntax. " +#| "(The scope syntax implicit insert ::) Using both syntaxes together will " +#| "trigger a bug which some users unfortunately relay on: An option with the " +#| "unusual name \"<literal>::</literal>\" which acts like every other option " +#| "with a name. These introduces many problems including that a user who " +#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the " +#| "hope to append to a list will gain the opposite as only the last " +#| "assignment for this option \"<literal>::</literal>\" will be used. " +#| "Upcoming APT versions will raise errors and will stop working if they " +#| "encounter this misuse, so please correct such statements now as long as " +#| "APT doesn't complain explicit about them." msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -5803,20 +5883,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5830,12 +5912,12 @@ msgstr "" "«5.0*». Vea también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5844,12 +5926,12 @@ msgstr "" "problemas ignore los paquetes retenidos en la toma de decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5863,12 +5945,12 @@ msgstr "" "mecanismo directo para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5932,12 +6014,12 @@ msgstr "" "actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5954,28 +6036,46 @@ msgstr "" "libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow y Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 +#, fuzzy +#| msgid "" +#| "APT uses since version 0.7.26 a resizable memory mapped cache file to " +#| "store the 'available' information. <literal>Cache-Start</literal> acts as " +#| "a hint to which size the Cache will grow and is therefore the amount of " +#| "memory APT will request at startup. The default value is 20971520 bytes " +#| "(~20 MB). Note that these amount of space need to be available for APT " +#| "otherwise it will likely fail ungracefully, so for memory restricted " +#| "devices these value should be lowered while on systems with a lot of " +#| "configured sources this might be increased. <literal>Cache-Grow</" +#| "literal> defines in byte with the default of 1048576 (~1 MB) how much the " +#| "Cache size will be increased in the event the space defined by " +#| "<literal>Cache-Start</literal> is not enough. These value will be applied " +#| "again and again until either the cache is big enough to store all " +#| "information or the size of the cache reaches the <literal>Cache-Limit</" +#| "literal>. The default of <literal>Cache-Limit</literal> is 0 which " +#| "stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +#| "automatic grow of the cache is disabled." msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" "A partir de la versión 0.7.26, APT usa un fichero de caché mapeado («mapped " "cache file») redimensionable para almacenar la información disponible. " @@ -5996,23 +6096,23 @@ msgstr "" "crecimiento automático del cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Define qué paquete(s) se consideran dependencias de creación esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6021,12 +6121,12 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6035,12 +6135,12 @@ msgstr "" "la documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6049,17 +6149,17 @@ msgstr "" "la documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6079,12 +6179,12 @@ msgstr "" "<literal>Max-ValidTime</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 #, fuzzy #| msgid "" #| "Seconds the Release file should be considered valid after it was created. " @@ -6101,8 +6201,8 @@ msgid "" "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" "Los segundos que el fichero «Release» se considerará válido después de su " "creación. El valor predeterminado es «para siempre» (cero) si el fichero " @@ -6117,14 +6217,14 @@ msgstr "" "opción." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 #, fuzzy #| msgid "Max-ValidTime" msgid "Min-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 #, fuzzy #| msgid "" #| "Seconds the Release file should be considered valid after it was created. " @@ -6157,12 +6257,12 @@ msgstr "" "opción." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6172,7 +6272,7 @@ msgstr "" "predeterminada" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 #, fuzzy #| msgid "" #| "Two sub-options to limit the use of PDiffs are also available: With " @@ -6184,7 +6284,7 @@ msgstr "" msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." @@ -6197,12 +6297,12 @@ msgstr "" "estos límites, se descargará el fichero completo en lugar de los parches." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6217,12 +6317,12 @@ msgstr "" "se abrirá una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6231,12 +6331,12 @@ msgstr "" "intentar obtener los ficheros fallidos el número de veces proporcionado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6246,12 +6346,12 @@ msgstr "" "forma predeterminada." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6269,7 +6369,7 @@ msgstr "" "definir ninguna de las opciones anteriores." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6294,7 +6394,7 @@ msgstr "" "grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6305,26 +6405,26 @@ msgstr "" "realizar la conexión y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 -msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." -msgstr "" -"Se ofrece una opción para controlar la profundidad de la tubería en casos en " -"que el servidor remoto no cumpla con la RFC o tenga fallos (como pasa con " -"Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> puede ser un " -"valor entre 0 y 5, e indica cuántas peticiones sin resolver puede enviar " -"APT. DEBE especificar si la máquina remota no retrasa apropiadamente las " -"conexiones TCP, de otro modo los datos se corromperán. Las máquinas que " -"necesitan esto violan la RFC 2068." +#: apt.conf.5.xml:345 +msgid "" +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6339,7 +6439,7 @@ msgstr "" "implícitamente la descarga simultánea desde varios servidores)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6350,12 +6450,12 @@ msgstr "" "permiten el acceso para clientes que usan un identificador conocido." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6370,7 +6470,7 @@ msgstr "" "opción <literal>Pipeline-Depth</literal> no se puede usar por ahora." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6407,12 +6507,12 @@ msgstr "" "corresponde a la opción por máquina." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6446,7 +6546,7 @@ msgstr "" "URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6462,7 +6562,7 @@ msgstr "" "fichero de configuración de muestra para ver algunos ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6476,7 +6576,7 @@ msgstr "" "de http debido a su poca eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6492,18 +6592,18 @@ msgstr "" "compatibles con la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"algo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6525,12 +6625,12 @@ msgstr "" "para desmontar usando UMount." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6541,18 +6641,18 @@ msgstr "" "introducidos a gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6572,19 +6672,19 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6615,13 +6715,13 @@ msgstr "" "lista ya que se añadirá de forma automática." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6659,7 +6759,7 @@ msgstr "" "lista definida, sólo añadirá este tipo al principio de la lista." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6667,12 +6767,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6686,12 +6786,12 @@ msgstr "" "paquetes locales. El valor predeterminado es «false»." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6712,13 +6812,13 @@ msgstr "" "informarse de cuales están disponibles antes de definir valores imposibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6759,8 +6859,17 @@ msgstr "" "(«environment») sería «fr, de, en». <placeholder type=\"programlisting\" id=" "\"0\"/>" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6769,20 +6878,29 @@ msgstr "" "paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 +#, fuzzy +#| msgid "" +#| "The <literal>Dir::State</literal> section has directories that pertain to " +#| "local state information. <literal>lists</literal> is the directory to " +#| "place downloaded package lists in and <literal>status</literal> is the " +#| "name of the dpkg status file. <literal>preferences</literal> is the name " +#| "of the APT preferences file. <literal>Dir::State</literal> contains the " +#| "default directory to prefix on all sub items if they do not start with " +#| "<filename>/</filename> or <filename>./</filename>." msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" "La sección <literal>Dir::State</literal> contiene directorios que afectan a " "la información de estado local. <literal>lists</literal> es el directorio en " @@ -6794,7 +6912,7 @@ msgstr "" "empiecen con <filename>/</filename> ó <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6816,7 +6934,7 @@ msgstr "" "predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6832,7 +6950,7 @@ msgstr "" "<envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6843,7 +6961,7 @@ msgstr "" "Al finalizar este proceso carga el fichero de configuración principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6860,7 +6978,7 @@ msgstr "" "literal> especifican la ubicación de sus respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6881,7 +6999,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6899,12 +7017,12 @@ msgstr "" "de expresiones regulares." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6915,12 +7033,12 @@ msgstr "" "encuentran en la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6938,7 +7056,7 @@ msgstr "" "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6947,12 +7065,12 @@ msgstr "" "la línea de ordenes al ejecutar la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6961,12 +7079,12 @@ msgstr "" "la línea de ordenes al ejecutar la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6976,12 +7094,12 @@ msgstr "" "preguntará en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "Cómo invoca APT a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6990,7 +7108,7 @@ msgstr "" "se encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7001,17 +7119,17 @@ msgstr "" "introduce a &dpkg; como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7024,12 +7142,12 @@ msgstr "" "sh</filename>, y APT finalizará en caso de fallo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7045,7 +7163,7 @@ msgstr "" "instalar, uno por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7061,12 +7179,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7075,12 +7193,12 @@ msgstr "" "predeterminado es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7090,12 +7208,12 @@ msgstr "" "paquetes y a producir todos los binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 #, fuzzy #| msgid "" #| "APT can call dpkg in a way so it can make aggressive use of triggers over " @@ -7134,7 +7252,7 @@ msgstr "" "mientras se están configurando todos los paquetes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7148,7 +7266,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7172,12 +7290,12 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7198,12 +7316,12 @@ msgstr "" "añadirá esta opción a las llamadas de desempaquetado y borrado." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7232,12 +7350,12 @@ msgstr "" "sistema. " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7255,12 +7373,12 @@ msgstr "" "desactivar esta opción en todas las ejecuciones menos la última." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7276,12 +7394,12 @@ msgstr "" "necesarios para configurar este paquete." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7301,12 +7419,12 @@ msgstr "" "ser realmente útil." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7324,7 +7442,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7349,12 +7467,12 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "Las opciones «Periodic» y «Archives»" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7368,12 +7486,12 @@ msgstr "" "documentación de estas opciones." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "Opciones de depuración" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7390,7 +7508,7 @@ msgstr "" "para un usuario normal, aunque unas cuantas sí son:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7401,7 +7519,7 @@ msgstr "" "purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7412,7 +7530,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como un usuario normal." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7424,7 +7542,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7433,19 +7551,19 @@ msgstr "" "statfs en los identificadores de los CDROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "" "A continuación, se muestra la lista completa de las opciones de depuración " "de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7453,46 +7571,46 @@ msgstr "" "<literal>cdrom://</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante " "HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7501,12 +7619,12 @@ msgstr "" "criptográficas mediante <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7515,24 +7633,24 @@ msgstr "" "paquetes almacenadas en CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Describe el proceso de resolución de dependencias de compilación en &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7541,12 +7659,12 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7557,12 +7675,12 @@ msgstr "" "identificador de un CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7572,24 +7690,24 @@ msgstr "" "a la vez." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra los elementos que se añaden o se borran de la cola de descarga " "global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7599,12 +7717,12 @@ msgstr "" "ficheros descargados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7613,12 +7731,12 @@ msgstr "" "lista de índices de paquetes, y los errores relacionados con éstos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7628,12 +7746,12 @@ msgstr "" "índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7641,12 +7759,12 @@ msgstr "" "descargas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7655,12 +7773,12 @@ msgstr "" "de los paquetes y con la eliminación de los paquetes sin usar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7675,12 +7793,12 @@ msgstr "" "<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7710,24 +7828,24 @@ msgstr "" "la sección en la que aparece el paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" "Vuelca la configuración predeterminada a la salida estándar durante al " "iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7736,12 +7854,12 @@ msgstr "" "invocó, con los argumentos separados por un espacio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7750,12 +7868,12 @@ msgstr "" "estado y cualquier error encontrado durante el análisis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7764,12 +7882,12 @@ msgstr "" "literal> debería entregar los paquetes a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7777,22 +7895,22 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7801,12 +7919,12 @@ msgstr "" "lo que ocurre cuando se encuentra un problema de dependencias complejo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7817,12 +7935,12 @@ msgstr "" "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7831,7 +7949,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7840,13 +7958,13 @@ msgstr "" "valores de ejemplo para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -11326,6 +11444,34 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Ésto usará los archivos del disco previamente obtenidos." +#~ msgid "" +#~ "<literal>gencaches</literal> performs the same operation as <command>apt-" +#~ "get check</command>. It builds the source and package caches from the " +#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</" +#~ "filename>." +#~ msgstr "" +#~ "<literal>gencaches</literal> realiza la misma operación que <command>apt-" +#~ "get check</command>. Genera las caches de los paquetes fuente y de los " +#~ "paquetes binarios a partir de la lista de fuentes en &sources-list; y a " +#~ "partir de <filename>/var/lib/dpkg/status</filename>." + +#~ msgid "" +#~ "One setting is provided to control the pipeline depth in cases where the " +#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " +#~ "5 indicating how many outstanding requests APT should send. A value of " +#~ "zero MUST be specified if the remote host does not properly linger on TCP " +#~ "connections - otherwise data corruption will occur. Hosts which require " +#~ "this are in violation of RFC 2068." +#~ msgstr "" +#~ "Se ofrece una opción para controlar la profundidad de la tubería en casos " +#~ "en que el servidor remoto no cumpla con la RFC o tenga fallos (como pasa " +#~ "con Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> puede " +#~ "ser un valor entre 0 y 5, e indica cuántas peticiones sin resolver puede " +#~ "enviar APT. DEBE especificar si la máquina remota no retrasa " +#~ "apropiadamente las conexiones TCP, de otro modo los datos se corromperán. " +#~ "Las máquinas que necesitan esto violan la RFC 2068." + #, fuzzy #~| msgid "" #~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " diff --git a/doc/po/fr.po b/doc/po/fr.po index 5705d1582..5bf580d65 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+0300\n" "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -434,11 +434,17 @@ msgstr "" #. type: Plain text #: apt.ent:125 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +#| " <listitem><para>Storage area for package files in transit.\n" +#| " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -536,11 +542,17 @@ msgstr "" #. type: Plain text #: apt.ent:166 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +#| " <listitem><para>Storage area for state information in transit.\n" +#| " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -730,18 +742,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -820,22 +853,19 @@ msgstr "gencaches" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -"La commande <literal>gencaches</literal> fait la même chose que <command>apt-" -"get check</command>. Elle construit les caches des sources et des paquets à " -"partir des sources répertoriées dans &sources-list; et dans <filename>/var/" -"lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +#| msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showpkg <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -859,7 +889,7 @@ msgstr "" "résultat :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -885,7 +915,7 @@ msgstr "" "Reverse Provides: \n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -904,12 +934,12 @@ msgstr "" "consulter le code source d'APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "stats" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" @@ -919,7 +949,7 @@ msgstr "" "rapportées :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." @@ -928,7 +958,7 @@ msgstr "" "le cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -941,7 +971,7 @@ msgstr "" "dépendance. La majorité des paquets appartient à cette catégorie." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -959,7 +989,7 @@ msgstr "" "n'existe aucun paquet nommé « mail-transport-agent »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -972,7 +1002,7 @@ msgstr "" "le paquet « xless » remplit « X11-text-viewer »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -985,7 +1015,7 @@ msgstr "" "« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1000,7 +1030,7 @@ msgstr "" "Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1015,7 +1045,7 @@ msgstr "" "considérablement plus grande que le nombre total de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." @@ -1024,12 +1054,14 @@ msgstr "" "dépendances déclarées par tous les paquets présents dans le cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +#| msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showsrc <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -1040,12 +1072,12 @@ msgstr "" "les entrées qui déclarent que ces noms correspondent à des paquets binaires." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "dump" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1054,12 +1086,12 @@ msgstr "" "paquet du cache. Elle est d'abord destinée au débogage." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "dumpavail" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." @@ -1069,12 +1101,12 @@ msgstr "" "et la méthode &dselect; s'en sert." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "unmet" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1083,12 +1115,14 @@ msgstr "" "dépendances absentes dans le cache de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +#| msgid "show <replaceable>pkg(s)</replaceable>" +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "show <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." @@ -1098,12 +1132,14 @@ msgstr "" "argument." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +#| msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "search <replaceable>expression [ expression ... ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1126,7 +1162,7 @@ msgstr "" "seulement dans les noms de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." @@ -1135,12 +1171,14 @@ msgstr "" "rationnelles différentes sur lesquelles seront réalisées un « et » logique." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +#| msgid "depends <replaceable>pkg(s)</replaceable>" +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "depends <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." @@ -1150,12 +1188,14 @@ msgstr "" "satisfont ces dépendances." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +#, fuzzy +#| msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "rdepends <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." @@ -1164,12 +1204,14 @@ msgstr "" "dépendances inverses d'un paquet." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1184,7 +1226,7 @@ msgstr "" "l'option <option>--generate</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1195,12 +1237,14 @@ msgstr "" "affichés dans la liste créée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +#| msgid "dotty <replaceable>pkg(s)</replaceable>" +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "dotty <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1222,7 +1266,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1237,19 +1281,21 @@ msgstr "" "conflits." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" "Attention, dotty ne peut pas représenter des ensembles très grands de " "paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +#| msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "xvcg <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." @@ -1259,12 +1305,14 @@ msgstr "" "ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "policy <replaceable>[ paquet(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1277,12 +1325,14 @@ msgstr "" "paquet donné en argument." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +#, fuzzy +#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "madison <replaceable>[ paquet(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1302,24 +1352,24 @@ msgstr "" "literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1330,18 +1380,18 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1357,17 +1407,17 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1382,17 +1432,17 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "<option>--important</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1403,47 +1453,47 @@ msgstr "" "Élément de configuration : <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "<option>--no-pre-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "<option>--no-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "<option>--no-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "<option>--no-conflicts</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "<option>--no-breaks</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "<option>--no-replaces</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 #, fuzzy #| msgid "" #| "Per default the <literal>depends</literal> and <literal>rdepends</" @@ -1465,17 +1515,17 @@ msgstr "" "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "<option>--full</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1485,18 +1535,18 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1514,17 +1564,17 @@ msgstr "" "<literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1536,17 +1586,17 @@ msgstr "" "configuration : <literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "<option>-n</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1556,12 +1606,12 @@ msgstr "" "NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1572,12 +1622,12 @@ msgstr "" "configuration : <literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1589,12 +1639,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1605,46 +1655,46 @@ msgstr "" "Élément de configuration : <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "Voir aussi" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnostics" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -2026,20 +2076,22 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -2099,7 +2151,7 @@ msgstr "" "<filename>package.config.XXXX</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -3333,7 +3385,7 @@ msgstr "" "generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "Exemples" @@ -4260,10 +4312,16 @@ msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:400 +#, fuzzy +#| msgid "" +#| "Do not install new packages; When used in conjunction with " +#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent " +#| "packages on the command line from being upgraded if they are not already " +#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" "N'install aucun nouveau paquet ; quand elle est utilisée avec " @@ -4273,12 +4331,12 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4294,12 +4352,12 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4321,12 +4379,12 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4340,12 +4398,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4354,12 +4412,12 @@ msgstr "" "Élément de configuration : <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4377,17 +4435,17 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4409,12 +4467,12 @@ msgstr "" "Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4428,12 +4486,12 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4443,12 +4501,12 @@ msgstr "" "Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4461,12 +4519,12 @@ msgstr "" "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4486,22 +4544,22 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4513,12 +4571,12 @@ msgstr "" "literal>, " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4528,12 +4586,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4545,7 +4603,7 @@ msgstr "" "AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4554,7 +4612,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4565,7 +4623,7 @@ msgstr "" "« HOWTO » d'APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4574,22 +4632,22 @@ msgstr "" "décimal 100 en cas d'erreur." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "AUTEURS D'ORIGINE" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "AUTEURS ACTUELS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4624,16 +4682,16 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 #, fuzzy #| msgid "" #| "Add a new key to the list of trusted keys. The key is read from " #| "<replaceable>filename</replaceable>, or standard input if " #| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" "Ajouter une clé à la liste des clés fiables. La clé est lue dans " "<replaceable>fichier</replaceable>, ou sur l'entrée standard si " @@ -5686,12 +5744,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:127 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name. (As " +#| "you might suspect: The scope syntax can't be used on the command line.)" msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" "Tous les outils d'APT possèdent une option <option>-o</option> qui permet de " @@ -5704,11 +5770,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:134 +#, fuzzy +#| msgid "" +#| "Note that you can use :: only for appending one item per line to a list " +#| "and that you should not use it in combination with the scope syntax. " +#| "(The scope syntax implicit insert ::) Using both syntaxes together will " +#| "trigger a bug which some users unfortunately relay on: An option with the " +#| "unusual name \"<literal>::</literal>\" which acts like every other option " +#| "with a name. These introduces many problems including that a user who " +#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the " +#| "hope to append to a list will gain the opposite as only the last " +#| "assignment for this option \"<literal>::</literal>\" will be used. " +#| "Upcoming APT versions will raise errors and will stop working if they " +#| "encounter this misuse, so please correct such statements now as long as " +#| "APT doesn't complain explicit about them." msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -5767,20 +5847,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5794,12 +5876,12 @@ msgstr "" "&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5809,12 +5891,12 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5828,12 +5910,12 @@ msgstr "" "direct pour les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5897,12 +5979,12 @@ msgstr "" "utilisée afin qu'il soit étudié et corrigé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5920,28 +6002,46 @@ msgstr "" "les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow et Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 +#, fuzzy +#| msgid "" +#| "APT uses since version 0.7.26 a resizable memory mapped cache file to " +#| "store the 'available' information. <literal>Cache-Start</literal> acts as " +#| "a hint to which size the Cache will grow and is therefore the amount of " +#| "memory APT will request at startup. The default value is 20971520 bytes " +#| "(~20 MB). Note that these amount of space need to be available for APT " +#| "otherwise it will likely fail ungracefully, so for memory restricted " +#| "devices these value should be lowered while on systems with a lot of " +#| "configured sources this might be increased. <literal>Cache-Grow</" +#| "literal> defines in byte with the default of 1048576 (~1 MB) how much the " +#| "Cache size will be increased in the event the space defined by " +#| "<literal>Cache-Start</literal> is not enough. These value will be applied " +#| "again and again until either the cache is big enough to store all " +#| "information or the size of the cache reaches the <literal>Cache-Limit</" +#| "literal>. The default of <literal>Cache-Limit</literal> is 0 which " +#| "stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +#| "automatic grow of the cache is disabled." msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" "À partir de la version 0.7.26, APT utilise un fichier de cache de taille " "variable indexé en mémoire (« resizable memory mapped cache file ») pour " @@ -5965,24 +6065,24 @@ msgstr "" "l'augmentation automatique de la taille du cache est désactivée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5992,12 +6092,12 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6007,12 +6107,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6022,17 +6122,17 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6052,12 +6152,12 @@ msgstr "" "ValidTime</literal> est alors utilisée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 #, fuzzy #| msgid "" #| "Seconds the Release file should be considered valid after it was created. " @@ -6074,8 +6174,8 @@ msgid "" "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" "Durée (en secondes) pendant laquelle un fichier Release est considéré comme " "valable, à partir du moment de sa création. La valeur par défaut est 0 " @@ -6089,14 +6189,14 @@ msgstr "" "défini en ajoutant l'étiquette de l'archive au nom de l'option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 #, fuzzy #| msgid "Max-ValidTime" msgid "Min-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 #, fuzzy #| msgid "" #| "Seconds the Release file should be considered valid after it was created. " @@ -6128,12 +6228,12 @@ msgstr "" "défini en ajoutant l'étiquette de l'archive au nom de l'option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6143,7 +6243,7 @@ msgstr "" "télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 #, fuzzy #| msgid "" #| "Two sub-options to limit the use of PDiffs are also available: With " @@ -6155,7 +6255,7 @@ msgstr "" msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." @@ -6170,12 +6270,12 @@ msgstr "" "fichiers de différences." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6191,12 +6291,12 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6206,12 +6306,12 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6221,12 +6321,12 @@ msgstr "" "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6246,7 +6346,7 @@ msgstr "" "options de mandataire HTTP." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6271,7 +6371,7 @@ msgstr "" "en compte aucune de ces options." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6282,27 +6382,26 @@ msgstr "" "données." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 -msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." -msgstr "" -"Une option de configuration est fournie pour contrôler la profondeur du tube " -"pour le cas où un serveur distant n'est pas conforme à la RFC ou est bogué " -"(comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </literal> a une " -"valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en attente " -"qui peuvent être émises. Quand la machine distante ne conserve pas " -"correctement les connexions TCP, la valeur doit égale à 0. Dans le cas " -"contraire, des données seront corrompues. Les machines qui ont besoin de " -"cette option ne respectent pas la RFC 2068." +#: apt.conf.5.xml:345 +msgid "" +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6317,7 +6416,7 @@ msgstr "" "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6329,12 +6428,12 @@ msgstr "" "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6350,7 +6449,7 @@ msgstr "" "encore gérée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6382,12 +6481,12 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6422,7 +6521,7 @@ msgstr "" "correspond à l'élément respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6439,7 +6538,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6454,7 +6553,7 @@ msgstr "" "efficacité de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6470,18 +6569,18 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6503,12 +6602,12 @@ msgstr "" "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6519,18 +6618,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6550,19 +6649,19 @@ msgstr "" "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6593,13 +6692,13 @@ msgstr "" "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6637,7 +6736,7 @@ msgstr "" "elle sera simplement préfixée avec l'option en question." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 #, fuzzy #| msgid "" #| "The special type <literal>uncompressed</literal> can be used to give " @@ -6655,12 +6754,12 @@ msgstr "" "surtout destiné aux miroirs locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6675,12 +6774,12 @@ msgstr "" "(« False »)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "Langues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6702,13 +6801,13 @@ msgstr "" "sur ce qui est disponible avant d'établir des réglages impossibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6749,8 +6848,17 @@ msgstr "" "dernier cas, l'ordre est alors « de, fr, en ». <placeholder type=" "\"programlisting\" id=\"0\"/>" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6760,20 +6868,29 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 +#, fuzzy +#| msgid "" +#| "The <literal>Dir::State</literal> section has directories that pertain to " +#| "local state information. <literal>lists</literal> is the directory to " +#| "place downloaded package lists in and <literal>status</literal> is the " +#| "name of the dpkg status file. <literal>preferences</literal> is the name " +#| "of the APT preferences file. <literal>Dir::State</literal> contains the " +#| "default directory to prefix on all sub items if they do not start with " +#| "<filename>/</filename> or <filename>./</filename>." msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" "Les répertoires de la section <literal>Dir::State</literal> concernent le " "système local. <literal>lists</literal> est le répertoire où placer les " @@ -6785,7 +6902,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6808,7 +6925,7 @@ msgstr "" "Cache</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6823,7 +6940,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6834,7 +6951,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6852,7 +6969,7 @@ msgstr "" "programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6874,7 +6991,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6892,12 +7009,12 @@ msgstr "" "est possible d'utiliser la syntaxe des expressions rationnelles." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6908,12 +7025,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6931,7 +7048,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6940,12 +7057,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6954,12 +7071,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6969,12 +7086,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6983,7 +7100,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6994,17 +7111,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7017,12 +7134,12 @@ msgstr "" "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7038,7 +7155,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7054,12 +7171,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7068,12 +7185,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7083,14 +7200,14 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7117,7 +7234,7 @@ msgstr "" "configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7131,7 +7248,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7155,12 +7272,12 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7182,12 +7299,12 @@ msgstr "" "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7215,12 +7332,12 @@ msgstr "" "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7239,12 +7356,12 @@ msgstr "" "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7262,12 +7379,12 @@ msgstr "" "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7292,12 +7409,12 @@ msgstr "" "traduction n'est pas exclu...)." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7315,7 +7432,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7341,12 +7458,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7358,12 +7475,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7381,7 +7498,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7392,7 +7509,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7404,7 +7521,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7416,7 +7533,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7425,17 +7542,17 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7443,44 +7560,44 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7489,12 +7606,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7503,24 +7620,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7529,12 +7646,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7545,12 +7662,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7560,24 +7677,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7587,12 +7704,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7602,12 +7719,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7617,12 +7734,12 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7630,12 +7747,12 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7644,12 +7761,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7664,12 +7781,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7704,24 +7821,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur " "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7730,12 +7847,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7745,12 +7862,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7759,33 +7876,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7794,12 +7911,12 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7810,12 +7927,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7824,7 +7941,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7833,13 +7950,13 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -11330,6 +11447,35 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." +#~ msgid "" +#~ "<literal>gencaches</literal> performs the same operation as <command>apt-" +#~ "get check</command>. It builds the source and package caches from the " +#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</" +#~ "filename>." +#~ msgstr "" +#~ "La commande <literal>gencaches</literal> fait la même chose que " +#~ "<command>apt-get check</command>. Elle construit les caches des sources " +#~ "et des paquets à partir des sources répertoriées dans &sources-list; et " +#~ "dans <filename>/var/lib/dpkg/status</filename>." + +#~ msgid "" +#~ "One setting is provided to control the pipeline depth in cases where the " +#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " +#~ "5 indicating how many outstanding requests APT should send. A value of " +#~ "zero MUST be specified if the remote host does not properly linger on TCP " +#~ "connections - otherwise data corruption will occur. Hosts which require " +#~ "this are in violation of RFC 2068." +#~ msgstr "" +#~ "Une option de configuration est fournie pour contrôler la profondeur du " +#~ "tube pour le cas où un serveur distant n'est pas conforme à la RFC ou est " +#~ "bogué (comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </" +#~ "literal> a une valeur comprise entre 0 et 5 : elle indique le nombre de " +#~ "requêtes en attente qui peuvent être émises. Quand la machine distante ne " +#~ "conserve pas correctement les connexions TCP, la valeur doit égale à 0. " +#~ "Dans le cas contraire, des données seront corrompues. Les machines qui " +#~ "ont besoin de cette option ne respectent pas la RFC 2068." + #~ msgid "" #~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " #~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " diff --git a/doc/po/it.po b/doc/po/it.po index b1522cafe..7c0d1a121 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+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" @@ -320,7 +320,7 @@ msgstr "" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -391,7 +391,7 @@ msgstr "" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -550,18 +550,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -633,18 +654,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -658,7 +678,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -674,7 +694,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -686,26 +706,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -714,7 +734,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -725,7 +745,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -734,7 +754,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -743,7 +763,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -753,7 +773,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -763,19 +783,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -783,60 +803,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -851,43 +871,43 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -897,7 +917,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -905,12 +925,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -923,7 +943,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -932,29 +952,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -963,12 +983,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -980,24 +1000,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1005,18 +1025,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1026,17 +1046,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1045,17 +1065,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1063,47 +1083,47 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -1113,35 +1133,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1152,17 +1172,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1170,29 +1190,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1200,12 +1220,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1213,12 +1233,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1226,46 +1246,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -1571,20 +1591,22 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -1630,7 +1652,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "" @@ -2599,7 +2621,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "" @@ -3271,18 +3293,18 @@ msgstr "" #: apt-get.8.xml:400 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -3292,12 +3314,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3310,12 +3332,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3324,24 +3346,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3352,17 +3374,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3376,12 +3398,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3390,24 +3412,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3416,12 +3438,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3433,22 +3455,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3456,24 +3478,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3481,14 +3503,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3496,29 +3518,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "" @@ -3552,11 +3574,11 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -4330,8 +4352,8 @@ msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" @@ -4341,7 +4363,7 @@ msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -4381,20 +4403,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4403,24 +4427,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4429,12 +4453,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4467,12 +4491,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4483,88 +4507,88 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -4576,28 +4600,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 msgid "Min-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -4608,35 +4632,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4646,36 +4670,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4686,7 +4710,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4700,7 +4724,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4708,19 +4732,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:345 msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4730,7 +4761,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4738,12 +4769,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4753,7 +4784,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4774,12 +4805,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4798,7 +4829,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4808,7 +4839,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4817,7 +4848,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4827,18 +4858,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4851,12 +4882,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4864,18 +4895,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4887,19 +4918,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4916,13 +4947,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4937,7 +4968,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4945,12 +4976,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4959,12 +4990,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4977,13 +5008,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -5005,32 +5036,41 @@ msgid "" "\"0\"/>" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5043,7 +5083,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5053,7 +5093,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5061,7 +5101,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5072,7 +5112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5085,7 +5125,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -5096,13 +5136,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5110,12 +5150,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5126,50 +5166,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5177,17 +5217,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5196,12 +5236,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5211,7 +5251,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5221,36 +5261,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -5265,7 +5305,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5275,7 +5315,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5289,12 +5329,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5306,12 +5346,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5327,12 +5367,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5343,12 +5383,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5358,12 +5398,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5375,12 +5415,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5392,7 +5432,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5406,12 +5446,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5420,12 +5460,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5436,7 +5476,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5444,7 +5484,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5452,7 +5492,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5462,111 +5502,111 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5574,93 +5614,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5670,12 +5710,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5692,91 +5732,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5784,32 +5824,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 88f942068..1c516263e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+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" @@ -445,11 +445,17 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Plain text #: apt.ent:125 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +#| " <listitem><para>Storage area for package files in transit.\n" +#| " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -552,11 +558,17 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Plain text #: apt.ent:166 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +#| " <listitem><para>Storage area for state information in transit.\n" +#| " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -759,18 +771,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -854,27 +887,24 @@ msgstr "" msgid "gencaches" msgstr "gencaches" -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -"<literal>gencaches</literal> は、<command>apt-get check</command> と同じ動作" -"を提供します。これは &sources-list; 内の取得元と <filename>/var/lib/dpkg/" -"status</filename>から、ソースとパッケージのキャッシュを構築します。" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +#| msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showpkg <replaceable>pkg(s)</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -897,7 +927,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -925,7 +955,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -944,13 +974,13 @@ msgstr "" "apt のソースコードを調べるのが最良でしょう。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "stats" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" @@ -960,7 +990,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." @@ -970,7 +1000,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -983,7 +1013,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -1001,7 +1031,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -1015,7 +1045,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -1029,7 +1059,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1045,7 +1075,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1060,7 +1090,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." @@ -1070,13 +1100,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +#| msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showsrc <replaceable>pkg(s)</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -1087,13 +1119,13 @@ msgstr "" "べてのバージョンについて表示します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "dump" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1102,13 +1134,13 @@ msgstr "" "覧を表示します。主にデバッグ用です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "dumpavail" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." @@ -1117,13 +1149,13 @@ msgstr "" "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "unmet" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1133,13 +1165,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +#| msgid "show <replaceable>pkg(s)</replaceable>" +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "show <replaceable>pkg(s)</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." @@ -1148,13 +1182,15 @@ msgstr "" "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +#| msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "search <replaceable>regex [ regex ... ]</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1179,7 +1215,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." @@ -1187,13 +1223,15 @@ msgstr "空白で区切った引数で、複数の検索パターンの and を # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +#| msgid "depends <replaceable>pkg(s)</replaceable>" +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "depends <replaceable>pkg(s)</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." @@ -1203,13 +1241,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +#, fuzzy +#| msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "rdepends <replaceable>pkg(s)</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." @@ -1218,13 +1258,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "pkgnames <replaceable>[ prefix ]</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1238,7 +1280,7 @@ msgstr "" "generate</option> オプションと共に使用すると非常に便利です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1250,13 +1292,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +#| msgid "dotty <replaceable>pkg(s)</replaceable>" +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "dotty <replaceable>pkg(s)</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1276,7 +1320,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1290,18 +1334,20 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +#| msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "xvcg <replaceable>pkg(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." @@ -1311,13 +1357,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "policy <replaceable>[ pkg(s) ]</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1330,13 +1378,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +#, fuzzy +#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "madison <replaceable>[ pkg(s) ]</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1355,25 +1405,25 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1384,19 +1434,19 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1411,18 +1461,18 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1435,18 +1485,18 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "<option>--important</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1457,48 +1507,48 @@ msgstr "" "Cache::Important</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "<option>--no-pre-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "<option>--no-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "<option>--no-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "<option>--no-conflicts</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "<option>--no-breaks</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "<option>--no-replaces</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 #, fuzzy msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " @@ -1512,18 +1562,18 @@ msgstr "" "RecurseDepends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "<option>--full</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1532,19 +1582,19 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1560,18 +1610,18 @@ msgstr "" "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1583,18 +1633,18 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "<option>-n</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1603,13 +1653,13 @@ msgstr "" "Cache::NamesOnly</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1619,13 +1669,13 @@ msgstr "" "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1636,13 +1686,13 @@ msgstr "" "RecurseDepends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1654,51 +1704,51 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "ファイル" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "関連項目" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "診断メッセージ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -2096,22 +2146,24 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -2174,7 +2226,7 @@ msgstr "" "<filename>package.config.XXXX</filename> と言った形になります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -3455,7 +3507,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "サンプル" @@ -4382,8 +4434,8 @@ msgstr "<option>--only-upgrade</option>" #, fuzzy msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" "パッケージ更新なし - <literal>install</literal> と同時に使用すると、" @@ -4391,13 +4443,13 @@ msgstr "" "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4411,13 +4463,13 @@ msgstr "" "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4438,13 +4490,13 @@ msgstr "" "Print-URIs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4457,13 +4509,13 @@ msgstr "" "<literal>APT::Get::Purge</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4472,13 +4524,13 @@ msgstr "" "定項目 - <literal>APT::Get::ReInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4494,18 +4546,18 @@ msgstr "" "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4527,13 +4579,13 @@ msgstr "" "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4546,13 +4598,13 @@ msgstr "" "目 - <literal>APT::Get::Trivial-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4561,13 +4613,13 @@ msgstr "" "項目 - <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4580,13 +4632,13 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4604,23 +4656,23 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4631,13 +4683,13 @@ msgstr "" "Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4646,13 +4698,13 @@ msgstr "" "<literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4663,7 +4715,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4673,7 +4725,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4685,7 +4737,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4694,22 +4746,22 @@ msgstr "" "100 を返します。" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "原著者" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "現著者" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4750,16 +4802,16 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 #, fuzzy #| msgid "" #| "Add a new key to the list of trusted keys. The key is read from " #| "<replaceable>filename</replaceable>, or standard input if " #| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" "信頼キー一覧に新しいキーを追加します。このキーは <replaceable>filename</" "replaceable> から読み込みますが、<replaceable>filename</replaceable> を " @@ -5855,12 +5907,20 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:127 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name. (As " +#| "you might suspect: The scope syntax can't be used on the command line.)" msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" "すべての APT ツールで、コマンドラインで任意の設定ディレクティブを指定できる -" @@ -5871,11 +5931,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:134 +#, fuzzy +#| msgid "" +#| "Note that you can use :: only for appending one item per line to a list " +#| "and that you should not use it in combination with the scope syntax. " +#| "(The scope syntax implicit insert ::) Using both syntaxes together will " +#| "trigger a bug which some users unfortunately relay on: An option with the " +#| "unusual name \"<literal>::</literal>\" which acts like every other option " +#| "with a name. These introduces many problems including that a user who " +#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the " +#| "hope to append to a list will gain the opposite as only the last " +#| "assignment for this option \"<literal>::</literal>\" will be used. " +#| "Upcoming APT versions will raise errors and will stop working if they " +#| "encounter this misuse, so please correct such statements now as long as " +#| "APT doesn't complain explicit about them." msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -5934,21 +6008,23 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5961,13 +6037,13 @@ msgstr "" "'4.0', '5.0*' となります。&apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "Ignore-Hold" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5977,13 +6053,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "Clean-Installed" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5998,12 +6074,12 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -6059,13 +6135,13 @@ msgstr "" "レポートをおねがいします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6083,49 +6159,49 @@ msgstr "" "不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "Build-Essential" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "Get" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6134,13 +6210,13 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "Cache" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6149,13 +6225,13 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "CDROM" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6165,17 +6241,17 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6187,30 +6263,30 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 #, fuzzy #| msgid "Max-ValidTime" msgid "Min-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -6221,12 +6297,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6236,7 +6312,7 @@ msgstr "" "ルトでは True です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 #, fuzzy #| msgid "" #| "Two sub-options to limit the use of PDiffs are also available: With " @@ -6248,7 +6324,7 @@ msgstr "" msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." @@ -6260,13 +6336,13 @@ msgstr "" "をダウンロードする代わりに、完全なファイルをダウンロードします。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "Queue-Mode" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6281,13 +6357,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "Retries" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6296,13 +6372,13 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "Source-Symlinks" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6313,13 +6389,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6337,7 +6413,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6362,7 +6438,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6372,28 +6448,27 @@ msgstr "" "設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま" "す。" -# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 -msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." -msgstr "" -"リモートサーバが RFC 準拠でなかったり、(Squid 2.0.2 のように) バグがあったり" -"したときのために、パイプラインの深さの制御を設定します。<literal>Acquire::" -"http::Pipeline-Depth</literal> により、APT が送信できるリクエストの回数を 0 " -"から 5 の値で設定できます。リモートサーバが適切でなく、TCP 接続に時間がかかる" -"ときは、<emphasis>必ず</emphasis> 0 の値を設定しなければなりません。そうでな" -"ければデータが破損してしまいます。これが必要なホストは RFC 2068 に違反してい" -"ます。" +#: apt.conf.5.xml:345 +msgid "" +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6407,7 +6482,7 @@ msgstr "" "ロードしなくなることに注意してください)。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6419,12 +6494,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6439,7 +6514,7 @@ msgstr "" "いません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6476,13 +6551,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6515,7 +6590,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6531,7 +6606,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6545,7 +6620,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6562,19 +6637,19 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6595,13 +6670,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "gpgv" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6612,18 +6687,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6641,19 +6716,19 @@ msgstr "" "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6681,13 +6756,13 @@ msgstr "" "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6723,7 +6798,7 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6732,12 +6807,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6746,12 +6821,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6764,13 +6839,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6792,9 +6867,18 @@ msgid "" "\"0\"/>" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6805,21 +6889,30 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 +#, fuzzy +#| msgid "" +#| "The <literal>Dir::State</literal> section has directories that pertain to " +#| "local state information. <literal>lists</literal> is the directory to " +#| "place downloaded package lists in and <literal>status</literal> is the " +#| "name of the dpkg status file. <literal>preferences</literal> is the name " +#| "of the APT preferences file. <literal>Dir::State</literal> contains the " +#| "default directory to prefix on all sub items if they do not start with " +#| "<filename>/</filename> or <filename>./</filename>." msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" "<literal>Dir::State</literal> セクションは、ローカル状態情報に関するディレク" "トリを保持します。<literal>lists</literal> は、ダウンロードしたパッケージ一覧" @@ -6831,7 +6924,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6853,7 +6946,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6868,7 +6961,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6880,7 +6973,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6898,7 +6991,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6918,7 +7011,7 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6930,13 +7023,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6946,13 +7039,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "Clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6969,7 +7062,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6979,13 +7072,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "Updateoptions" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6994,13 +7087,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -7010,13 +7103,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7026,7 +7119,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7036,18 +7129,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "Post-Invoke" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7061,13 +7154,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7083,7 +7176,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7099,13 +7192,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "Run-Directory" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7115,13 +7208,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "Build-options" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7130,12 +7223,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "dpkg トリガの使い方 (および関連オプション)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7150,7 +7243,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7164,7 +7257,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7178,12 +7271,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7196,12 +7289,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7218,12 +7311,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7234,12 +7327,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7249,12 +7342,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7266,12 +7359,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7289,7 +7382,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7303,12 +7396,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7322,12 +7415,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7338,7 +7431,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7349,7 +7442,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7360,7 +7453,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7372,7 +7465,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7381,59 +7474,59 @@ msgstr "" "を無効にします。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "以下は apt に対するデバッグオプションのすべてです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7441,12 +7534,12 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7455,22 +7548,22 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7478,12 +7571,12 @@ msgstr "" "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7493,12 +7586,12 @@ msgstr "" "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7507,23 +7600,23 @@ msgstr "" "<quote><literal>apt-get update</literal></quote> を実行できるようになります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7532,12 +7625,12 @@ msgstr "" "ジやエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7546,12 +7639,12 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7560,24 +7653,24 @@ msgstr "" "リストへのパッチ適用に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7586,12 +7679,12 @@ msgstr "" "に出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7606,12 +7699,12 @@ msgstr "" "路に対応しています。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7628,22 +7721,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7652,12 +7745,12 @@ msgstr "" "切られます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7666,12 +7759,12 @@ msgstr "" "を解析中に発生したエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7680,33 +7773,33 @@ msgstr "" "のトレースを生成します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "起動時の各パッケージの優先度を表示します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7715,12 +7808,12 @@ msgstr "" "した場合にのみ、適用されます)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7728,12 +7821,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7743,7 +7836,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7753,14 +7846,14 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "&file-aptconf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -10955,6 +11048,35 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。" +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#~ msgid "" +#~ "<literal>gencaches</literal> performs the same operation as <command>apt-" +#~ "get check</command>. It builds the source and package caches from the " +#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</" +#~ "filename>." +#~ msgstr "" +#~ "<literal>gencaches</literal> は、<command>apt-get check</command> と同じ動" +#~ "作を提供します。これは &sources-list; 内の取得元と <filename>/var/lib/" +#~ "dpkg/status</filename>から、ソースとパッケージのキャッシュを構築します。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#~ msgid "" +#~ "One setting is provided to control the pipeline depth in cases where the " +#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " +#~ "5 indicating how many outstanding requests APT should send. A value of " +#~ "zero MUST be specified if the remote host does not properly linger on TCP " +#~ "connections - otherwise data corruption will occur. Hosts which require " +#~ "this are in violation of RFC 2068." +#~ msgstr "" +#~ "リモートサーバが RFC 準拠でなかったり、(Squid 2.0.2 のように) バグがあった" +#~ "りしたときのために、パイプラインの深さの制御を設定します。" +#~ "<literal>Acquire::http::Pipeline-Depth</literal> により、APT が送信できる" +#~ "リクエストの回数を 0 から 5 の値で設定できます。リモートサーバが適切でな" +#~ "く、TCP 接続に時間がかかるときは、<emphasis>必ず</emphasis> 0 の値を設定し" +#~ "なければなりません。そうでなければデータが破損してしまいます。これが必要な" +#~ "ホストは RFC 2068 に違反しています。" + # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #, fuzzy #~| msgid "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 75f3089fa..d9cd4331d 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+0300\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -451,11 +451,17 @@ msgstr "" #. type: Plain text #: apt.ent:125 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +#| " <listitem><para>Storage area for package files in transit.\n" +#| " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -558,11 +564,17 @@ msgstr "" #. type: Plain text #: apt.ent:166 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +#| " <listitem><para>Storage area for state information in transit.\n" +#| " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -757,18 +769,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -850,27 +883,23 @@ msgstr "" msgid "gencaches" msgstr "gencaches" -# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -"<literal>gencaches</literal> wykonuje te same operacje, co <command>apt-get " -"check</command>. Buduje bufor pakietów oraz źródeł pakietów na podstawie " -"źródeł wymienionych w &sources-list; oraz pliku <filename>/var/lib/dpkg/" -"status</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +#| msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showpkg <replaceable>pakiet(y)</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -893,7 +922,7 @@ msgstr "" "poniższego:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -920,7 +949,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -939,13 +968,13 @@ msgstr "" "przejrzeć kod źródłowy programu apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "stats" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" @@ -955,7 +984,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." @@ -965,7 +994,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -979,7 +1008,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -997,7 +1026,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -1012,7 +1041,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -1027,7 +1056,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1044,7 +1073,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1061,7 +1090,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." @@ -1070,13 +1099,15 @@ msgstr "" "więzów zależności wymaganych przez wszystkie pakiety w buforze." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +#| msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showsrc <replaceable>pakiet(y)</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -1087,13 +1118,13 @@ msgstr "" "tych pakietów oraz pakiety binarne, które są z tych pakietów budowane." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "dump" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1102,13 +1133,13 @@ msgstr "" "Jest używany głównie w celu odpluskwiania." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "dumpavail" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." @@ -1118,13 +1149,13 @@ msgstr "" "&dpkg; i jest używane w metodzie &dselect; tego programu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "unmet" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1133,13 +1164,15 @@ msgstr "" "zależności w buforze pakietów" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +#| msgid "show <replaceable>pkg(s)</replaceable>" +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "show <replaceable>pakiet(y)</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." @@ -1148,15 +1181,17 @@ msgstr "" "avail</command>; pokazuje szczegółowe informacje o podanych pakietach." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +#| msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "" "search <replaceable>wyrażenie regularne [ wyrażenie regularne ... ]</" "replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1183,7 +1218,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." @@ -1192,13 +1227,15 @@ msgstr "" "traktowane jakby były połączone spójnikiem logicznym \"i\"." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +#| msgid "depends <replaceable>pkg(s)</replaceable>" +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "depends <replaceable>pakiet(y)</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." @@ -1207,13 +1244,15 @@ msgstr "" "pakietu i wszystkie możliwe pakiety, które mogą spełnić te zależności." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +#, fuzzy +#| msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "rdepends <replaceable>pakiet(y)</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." @@ -1222,13 +1261,15 @@ msgstr "" "danego pakietu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "pkgnames <replaceable>[ prefiks ]</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1243,7 +1284,7 @@ msgstr "" "używać z opcją <option>--generate</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1255,13 +1296,15 @@ msgstr "" "liście." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +#| msgid "dotty <replaceable>pkg(s)</replaceable>" +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "dotty <replaceable>pakiet(y)</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1283,7 +1326,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1298,17 +1341,19 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +#| msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "xvcg <replaceable>pakiet(y)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." @@ -1318,13 +1363,15 @@ msgstr "" "ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "policy <replaceable>[ pakiet(y) ]</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1337,13 +1384,15 @@ msgstr "" "wypisuje szczegółowe informacje o priorytecie danego pakietu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +#, fuzzy +#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1361,25 +1410,25 @@ msgstr "" "pakietów (<literal>APT::Architecture</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1390,19 +1439,19 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1418,18 +1467,18 @@ msgstr "" "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1443,18 +1492,18 @@ msgstr "" "pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "<option>--important</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1465,56 +1514,56 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 #, fuzzy #| msgid "<option>--no-upgrade</option>" msgid "<option>--no-pre-depends</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 #, fuzzy #| msgid "<option>--no-download</option>" msgid "<option>--no-depends</option>" msgstr "<option>--no-download</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 #, fuzzy #| msgid "<option>--install-recommends</option>" msgid "<option>--no-recommends</option>" msgstr "<option>--install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 #, fuzzy #| msgid "<option>--no-upgrade</option>" msgid "<option>--no-suggests</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 #, fuzzy #| msgid "<option>--no-mount</option>" msgid "<option>--no-conflicts</option>" msgstr "<option>--no-mount</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 #, fuzzy #| msgid "<option>--no-act</option>" msgid "<option>--no-breaks</option>" msgstr "<option>--no-act</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 #, fuzzy #| msgid "<option>--no-act</option>" msgid "<option>--no-replaces</option>" msgstr "<option>--no-act</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 #, fuzzy #| msgid "<option>--no-act</option>" msgid "<option>--no-enhances</option>" @@ -1522,7 +1571,7 @@ msgstr "<option>--no-act</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 #, fuzzy #| msgid "" #| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive " @@ -1541,18 +1590,18 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "<option>--full</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1561,19 +1610,19 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1591,18 +1640,18 @@ msgstr "" "AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1614,18 +1663,18 @@ msgstr "" "<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "<option>-n</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1634,13 +1683,13 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1652,13 +1701,13 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1670,13 +1719,13 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1687,48 +1736,48 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "Pliki" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "Zobacz także" # #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnostyka" # #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -2129,21 +2178,23 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" # #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -2202,7 +2253,7 @@ msgstr "" "config.XXXX</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -3232,7 +3283,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "Przykłady" @@ -4196,8 +4247,8 @@ msgstr "<option>--no-upgrade</option>" #| "Configuration Item: <literal>APT::Get::Upgrade</literal>." msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" "Nie aktualizuje pakietów. Użyte w połączeniu z <literal>install</literal>, " @@ -4206,13 +4257,13 @@ msgstr "" "<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4228,13 +4279,13 @@ msgstr "" "force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4256,13 +4307,13 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4276,13 +4327,13 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4291,13 +4342,13 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4314,18 +4365,18 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4348,13 +4399,13 @@ msgstr "" "stronę podręcznika &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4368,13 +4419,13 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4384,12 +4435,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4403,13 +4454,13 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4428,23 +4479,23 @@ msgstr "" "Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4455,13 +4506,13 @@ msgstr "" "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4472,12 +4523,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4488,7 +4539,7 @@ msgstr "" "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4498,7 +4549,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4510,7 +4561,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4519,22 +4570,22 @@ msgstr "" "w przypadku błędu." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "AUTORZY ORYGINAŁU" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "OBECNI AUTORZY" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4572,16 +4623,16 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 #, fuzzy #| msgid "" #| "Add a new key to the list of trusted keys. The key is read from " #| "<replaceable>filename</replaceable>, or standard input if " #| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" "Dodaje nowy klucz do listy zaufanych kluczy.Klucz jest czytany z podanej " "<replaceable>nazwy_pliku</replaceable> lub ze standardowego wejścia, jeśli " @@ -5491,8 +5542,8 @@ msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" @@ -5502,7 +5553,7 @@ msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -5542,20 +5593,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5564,25 +5617,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 #, fuzzy msgid "Clean-Installed" msgstr "B<--installed>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5591,12 +5644,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5629,12 +5682,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5645,88 +5698,88 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -5738,28 +5791,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 msgid "Min-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -5770,35 +5823,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -5808,37 +5861,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 #, fuzzy msgid "Source-Symlinks" msgstr "Sources" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -5849,7 +5902,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -5863,7 +5916,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -5871,19 +5924,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:345 +msgid "" +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:352 msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -5893,7 +5953,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -5901,12 +5961,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -5916,7 +5976,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -5937,12 +5997,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -5961,7 +6021,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -5971,7 +6031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -5980,7 +6040,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -5990,18 +6050,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6014,12 +6074,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6027,18 +6087,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6050,19 +6110,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6079,13 +6139,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6100,7 +6160,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6108,12 +6168,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6122,12 +6182,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6140,13 +6200,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6168,32 +6228,41 @@ msgid "" "\"0\"/>" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6206,7 +6275,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6216,7 +6285,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6224,7 +6293,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6235,7 +6304,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6248,7 +6317,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6259,12 +6328,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6272,13 +6341,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 #, fuzzy msgid "Clean" msgstr "B<clean>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6289,51 +6358,51 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 #, fuzzy msgid "Updateoptions" msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6341,17 +6410,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6360,12 +6429,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6375,7 +6444,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6385,37 +6454,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 #, fuzzy msgid "Build-options" msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -6430,7 +6499,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6444,7 +6513,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6458,12 +6527,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6475,12 +6544,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6496,12 +6565,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6512,12 +6581,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6527,12 +6596,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -6544,12 +6613,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6567,7 +6636,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -6581,12 +6650,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6595,13 +6664,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 #, fuzzy msgid "Debug options" msgstr "opcje" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6612,7 +6681,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6620,7 +6689,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6628,7 +6697,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6638,7 +6707,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -6648,104 +6717,104 @@ msgstr "" "in CDROM IDs." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -6753,93 +6822,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -6849,12 +6918,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -6871,91 +6940,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -6963,32 +7032,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -10209,6 +10278,18 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Które użyje pobranych uprzednio archiwów z dysku." +# +#~ msgid "" +#~ "<literal>gencaches</literal> performs the same operation as <command>apt-" +#~ "get check</command>. It builds the source and package caches from the " +#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</" +#~ "filename>." +#~ msgstr "" +#~ "<literal>gencaches</literal> wykonuje te same operacje, co <command>apt-" +#~ "get check</command>. Buduje bufor pakietów oraz źródeł pakietów na " +#~ "podstawie źródeł wymienionych w &sources-list; oraz pliku <filename>/var/" +#~ "lib/dpkg/status</filename>." + #, fuzzy #~| msgid "" #~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " diff --git a/doc/po/pt.po b/doc/po/pt.po index 734a06f71..f4905a63d 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+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" @@ -431,11 +431,17 @@ msgstr "" #. type: Plain text #: apt.ent:125 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +#| " <listitem><para>Storage area for package files in transit.\n" +#| " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -537,11 +543,17 @@ msgstr "" #. type: Plain text #: apt.ent:166 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +#| " <listitem><para>Storage area for state information in transit.\n" +#| " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -732,18 +744,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -826,21 +859,19 @@ msgstr "gencaches" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -"<literal>gencaches</literal> executa a mesma operação que o <command>apt-get " -"check</command>. Constrói as caches de fonte e pacote a partir das fontes em " -"&sources-list; e a partir de <filename>/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +#| msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showpkg <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -864,7 +895,7 @@ msgstr "" "ao seguinte:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -890,7 +921,7 @@ msgstr "" "Fornecimentos Reversos: \n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -909,12 +940,12 @@ msgstr "" "consultar o código fonte do apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "stats" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" @@ -923,7 +954,7 @@ msgstr "" "são esperados mais argumentos. As estatísticas reportadas são:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." @@ -932,7 +963,7 @@ msgstr "" "encontrados na cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -945,7 +976,7 @@ msgstr "" "dependências. A maioria dos pacotes caem nesta categoria." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -962,7 +993,7 @@ msgstr "" "agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -975,7 +1006,7 @@ msgstr "" "apenas um pacote, xless, disponibiliza \"X11-text-viewer\"." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -988,7 +1019,7 @@ msgstr "" "é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1004,7 +1035,7 @@ msgstr "" "declarações de Conflitos ou Breaks." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1019,7 +1050,7 @@ msgstr "" "consideravelmente maior que o número do total de nomes de pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." @@ -1028,12 +1059,14 @@ msgstr "" "dependências reivindicadas por todos os pacotes na cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +#| msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "showsrc <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -1045,12 +1078,12 @@ msgstr "" "Binário." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "dump" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1059,12 +1092,12 @@ msgstr "" "cache. É principalmente para depuração." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "dumpavail" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." @@ -1074,12 +1107,12 @@ msgstr "" "&dselect;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "unmet" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1088,12 +1121,14 @@ msgstr "" "insatisfeitas na cache do pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +#| msgid "show <replaceable>pkg(s)</replaceable>" +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "show <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." @@ -1102,12 +1137,14 @@ msgstr "" "print-avail</command>; mostra os registos do pacote para os pacotes nomeados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +#| msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "search <replaceable>regex [ regex ... ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1132,7 +1169,7 @@ msgstr "" "longa, apenas no nome do pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." @@ -1141,12 +1178,14 @@ msgstr "" "busca os quais são lidados em conjunto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +#| msgid "depends <replaceable>pkg(s)</replaceable>" +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "depends <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." @@ -1156,12 +1195,14 @@ msgstr "" "dependência." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 -msgid "rdepends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:192 +#, fuzzy +#| msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "rdepends <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." @@ -1170,12 +1211,14 @@ msgstr "" "que um pacote tem." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +#| msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1190,7 +1233,7 @@ msgstr "" "opção <option>--generate</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1201,12 +1244,14 @@ msgstr "" "também são listados na lista gerada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +#| msgid "dotty <replaceable>pkg(s)</replaceable>" +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "dotty <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1227,7 +1272,7 @@ msgstr "" "defina a opção <literal>APT::Cache::GivenOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1241,19 +1286,21 @@ msgstr "" "verdes são conflitos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de " "pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +#| msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "xvcg <replaceable>pacote(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." @@ -1263,12 +1310,14 @@ msgstr "" "VCG</ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "policy <replaceable>[ pacote(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1281,12 +1330,14 @@ msgstr "" "acerca da selecção de prioridade do pacote nomeado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:238 +#, fuzzy +#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "madison <replaceable>[ pacote(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1305,24 +1356,24 @@ msgstr "" "Architecture</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1333,18 +1384,18 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1359,17 +1410,17 @@ msgstr "" "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1383,17 +1434,17 @@ msgstr "" "Configuração: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "<option>--important</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1404,47 +1455,47 @@ msgstr "" "Configuração: <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "<option>--no-pre-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "<option>--no-depends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "<option>--no-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "<option>--no-conflicts</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "<option>--no-breaks</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "<option>--no-replaces</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 #, fuzzy #| msgid "" #| "Per default the <literal>depends</literal> and <literal>rdepends</" @@ -1466,17 +1517,17 @@ msgstr "" "ex. <literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "<option>--full</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1485,18 +1536,18 @@ msgstr "" "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1513,17 +1564,17 @@ msgstr "" "Configuração: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1535,17 +1586,17 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "<option>-n</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1554,12 +1605,12 @@ msgstr "" "Configuração: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1570,12 +1621,12 @@ msgstr "" "<literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1586,12 +1637,12 @@ msgstr "" "Configuração <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1602,46 +1653,46 @@ msgstr "" "<literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 msgid "See Also" msgstr "Veja também" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnóstico" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -2019,20 +2070,22 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 msgid "&apt-conf;" msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -2092,7 +2145,7 @@ msgstr "" "configuração.XXXX</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -3315,7 +3368,7 @@ msgstr "" "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 msgid "Examples" msgstr "Examples" @@ -4221,10 +4274,16 @@ msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:400 +#, fuzzy +#| msgid "" +#| "Do not install new packages; When used in conjunction with " +#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent " +#| "packages on the command line from being upgraded if they are not already " +#| "installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" "Não instala pacotes novos; Quando usado em conjunto com <literal>install</" @@ -4233,12 +4292,12 @@ msgstr "" "de Configuração: <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4253,12 +4312,12 @@ msgstr "" "<literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4279,12 +4338,12 @@ msgstr "" "Configuração: <literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4297,12 +4356,12 @@ msgstr "" "option>. Item de Configuração: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4311,12 +4370,12 @@ msgstr "" "Configuração: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4333,17 +4392,17 @@ msgstr "" "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4366,12 +4425,12 @@ msgstr "" "Release</literal>; veja também o manual &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4385,12 +4444,12 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4400,12 +4459,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4418,12 +4477,12 @@ msgstr "" "Configuração: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4442,22 +4501,22 @@ msgstr "" "<literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4468,12 +4527,12 @@ msgstr "" "Only</literal>, e <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4482,12 +4541,12 @@ msgstr "" "de Configuração: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4498,7 +4557,7 @@ msgstr "" "Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4507,7 +4566,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4518,7 +4577,7 @@ msgstr "" "&guidesdir;, &apt-preferences;, o Howto do APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4527,22 +4586,22 @@ msgstr "" "erro." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "AUTORES ORIGINAIS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "AUTORES ACTUAIS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4578,16 +4637,16 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 #, fuzzy #| msgid "" #| "Add a new key to the list of trusted keys. The key is read from " #| "<replaceable>filename</replaceable>, or standard input if " #| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" "Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de " "<replaceable>nome de ficheiro</replaceable>, ou entrada standard se " @@ -5644,12 +5703,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:127 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name. (As " +#| "you might suspect: The scope syntax can't be used on the command line.)" msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" "Todas as ferramentas do APT recebem uma opção -o que permite uma directiva " @@ -5662,11 +5729,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:134 +#, fuzzy +#| msgid "" +#| "Note that you can use :: only for appending one item per line to a list " +#| "and that you should not use it in combination with the scope syntax. " +#| "(The scope syntax implicit insert ::) Using both syntaxes together will " +#| "trigger a bug which some users unfortunately relay on: An option with the " +#| "unusual name \"<literal>::</literal>\" which acts like every other option " +#| "with a name. These introduces many problems including that a user who " +#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the " +#| "hope to append to a list will gain the opposite as only the last " +#| "assignment for this option \"<literal>::</literal>\" will be used. " +#| "Upcoming APT versions will raise errors and will stop working if they " +#| "encounter this misuse, so please correct such statements now as long as " +#| "APT doesn't complain explicit about them." msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -5723,20 +5804,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5749,12 +5832,12 @@ msgstr "" "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5763,12 +5846,12 @@ msgstr "" "os pacotes segurados sejam ignorados na sua decisão de marcação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5782,12 +5865,12 @@ msgstr "" "directo de os reinstalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5851,12 +5934,12 @@ msgstr "" "correcção do processo de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5873,28 +5956,46 @@ msgstr "" "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow e Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 +#, fuzzy +#| msgid "" +#| "APT uses since version 0.7.26 a resizable memory mapped cache file to " +#| "store the 'available' information. <literal>Cache-Start</literal> acts as " +#| "a hint to which size the Cache will grow and is therefore the amount of " +#| "memory APT will request at startup. The default value is 20971520 bytes " +#| "(~20 MB). Note that these amount of space need to be available for APT " +#| "otherwise it will likely fail ungracefully, so for memory restricted " +#| "devices these value should be lowered while on systems with a lot of " +#| "configured sources this might be increased. <literal>Cache-Grow</" +#| "literal> defines in byte with the default of 1048576 (~1 MB) how much the " +#| "Cache size will be increased in the event the space defined by " +#| "<literal>Cache-Start</literal> is not enough. These value will be applied " +#| "again and again until either the cache is big enough to store all " +#| "information or the size of the cache reaches the <literal>Cache-Limit</" +#| "literal>. The default of <literal>Cache-Limit</literal> is 0 which " +#| "stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +#| "automatic grow of the cache is disabled." msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" "O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de " "tamanho ajustável para armazenar a informação disponível. <literal>Cache-" @@ -5915,24 +6016,24 @@ msgstr "" "da cache é desactivado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Define quais pacote(s) são considerados dependências essenciais de " "compilação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5941,12 +6042,12 @@ msgstr "" "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -5955,12 +6056,12 @@ msgstr "" "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -5969,17 +6070,17 @@ msgstr "" "documentação para mais informação acerca das opções de aqui." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "O Grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6000,12 +6101,12 @@ msgstr "" "ValidTime</literal> seguinte." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 #, fuzzy #| msgid "" #| "Seconds the Release file should be considered valid after it was created. " @@ -6022,8 +6123,8 @@ msgid "" "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" "Segundos em que o ficheiro Release deve considerado válido após ser criado. " "A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não " @@ -6036,14 +6137,14 @@ msgstr "" "do arquivo ao nome da opção. " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 #, fuzzy #| msgid "Max-ValidTime" msgid "Min-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 #, fuzzy #| msgid "" #| "Seconds the Release file should be considered valid after it was created. " @@ -6074,12 +6175,12 @@ msgstr "" "do arquivo ao nome da opção. " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6089,7 +6190,7 @@ msgstr "" "predefinição." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 #, fuzzy #| msgid "" #| "Two sub-options to limit the use of PDiffs are also available: With " @@ -6101,7 +6202,7 @@ msgstr "" msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." @@ -6114,12 +6215,12 @@ msgstr "" "limites for excedido, é descarregado o ficheiro completo em vez das patches." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6134,12 +6235,12 @@ msgstr "" "aberta uma ligação por tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6148,12 +6249,12 @@ msgstr "" "tentar, no número fornecido de vezes, obter ficheiros falhados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6163,12 +6264,12 @@ msgstr "" "A predefinição é verdadeiro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6185,7 +6286,7 @@ msgstr "" "especificada, será usada a variável de ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6210,7 +6311,7 @@ msgstr "" "suporta nenhuma destas opções." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6221,26 +6322,26 @@ msgstr "" "e tempos limite de dados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 -msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." -msgstr "" -"É disponibilizada uma definição para controlar a profundidade do pipeline em " -"casos onde o servidor remoto não é compatível com RFC ou é buggy (como o " -"Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser um " -"valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve enviar. " -"TEM de ser especificado um valor de 0 se a máquina remota não hesitar " -"propriamente em ligações TCP - de outro modo irá ocorrer corrupção de dados. " -"As máquinas que requerem isto estão em violação de RFC 2068." +#: apt.conf.5.xml:345 +msgid "" +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6255,7 +6356,7 @@ msgstr "" "múltiplos servidores ao mesmo tempo.)" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6267,12 +6368,12 @@ msgstr "" "identificador conhecido." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6287,7 +6388,7 @@ msgstr "" "literal> ainda não é suportada." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6324,12 +6425,12 @@ msgstr "" "host>::SslForceVersion</literal> é a opção po máquina correspondente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6362,7 +6463,7 @@ msgstr "" "$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6378,7 +6479,7 @@ msgstr "" "específica (Veja a amostra de ficheiro de configuração para exemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6392,7 +6493,7 @@ msgstr "" "eficiência." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6407,18 +6508,18 @@ msgstr "" "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6439,12 +6540,12 @@ msgstr "" "Comandos para desmontar podem ser especificados usando UMount." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6455,18 +6556,18 @@ msgstr "" "passadas ao gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6485,19 +6586,19 @@ msgstr "" "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6528,13 +6629,13 @@ msgstr "" "lista pois será adicionado automaticamente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6571,7 +6672,7 @@ msgstr "" "sobrepor a lista definida, irá apenas prefixar a lista com este tipo." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6579,12 +6680,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6597,12 +6698,12 @@ msgstr "" "CPU quando constrói as caches de pacotes locais. Falso por predefinição." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6624,13 +6725,13 @@ msgstr "" "de definir aqui valores impossíveis." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6669,8 +6770,17 @@ msgstr "" "APT não for usado num ambiente em francês, em tal ambiente a ordem deveria " "ser \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6679,20 +6789,29 @@ msgstr "" "e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "Directories" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 +#, fuzzy +#| msgid "" +#| "The <literal>Dir::State</literal> section has directories that pertain to " +#| "local state information. <literal>lists</literal> is the directory to " +#| "place downloaded package lists in and <literal>status</literal> is the " +#| "name of the dpkg status file. <literal>preferences</literal> is the name " +#| "of the APT preferences file. <literal>Dir::State</literal> contains the " +#| "default directory to prefix on all sub items if they do not start with " +#| "<filename>/</filename> or <filename>./</filename>." msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" "A secção <literal>Dir::State</literal> tem directórios que pertencem à " "informação de estado local. <literal>lists</literal> é o directório para " @@ -6703,7 +6822,7 @@ msgstr "" "com <filename>/</filename> ou <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6724,7 +6843,7 @@ msgstr "" "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6739,7 +6858,7 @@ msgstr "" "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6750,7 +6869,7 @@ msgstr "" "estar feito então é carregado o ficheiro de configuração principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6768,7 +6887,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6789,7 +6908,7 @@ msgstr "" "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6807,12 +6926,12 @@ msgstr "" "expressão regular." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "APT em DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6823,12 +6942,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6845,7 +6964,7 @@ msgstr "" "descarregar novos pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6854,12 +6973,12 @@ msgstr "" "comandos quando é corrido para a fase de instalação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6868,12 +6987,12 @@ msgstr "" "comandos quando é executado para a fase de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6882,12 +7001,12 @@ msgstr "" "continuar. A predefinição é avisar apenas em caso de erro." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "Como o APT chama o dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6896,7 +7015,7 @@ msgstr "" "&dpkg;. Estas estão na secção <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6907,17 +7026,17 @@ msgstr "" "um argumento único ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6930,12 +7049,12 @@ msgstr "" "bin/sh</filename>, caso algum deles falhe, o APT irá abortar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6951,7 +7070,7 @@ msgstr "" "deb que vai instalar, um por cada linha." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6966,12 +7085,12 @@ msgstr "" "dado ao <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6980,12 +7099,12 @@ msgstr "" "predefinição é <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6994,12 +7113,12 @@ msgstr "" "predefinição é desactivar a assinatura e produzir todos os binários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "Utilização trigger do dpkg (e opções relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 #, fuzzy #| msgid "" #| "APT can call dpkg in a way so it can make aggressive use of triggers over " @@ -7038,7 +7157,7 @@ msgstr "" "todos os pacotes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7052,7 +7171,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7076,12 +7195,12 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7102,12 +7221,12 @@ msgstr "" "chamadas unpack e remove." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7135,12 +7254,12 @@ msgstr "" "poderia não arrancar!" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7158,12 +7277,12 @@ msgstr "" "esta opção em todas excepto na última execução." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7179,12 +7298,12 @@ msgstr "" "configurar este pacote." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7203,12 +7322,12 @@ msgstr "" "experimental e necessita de mais melhorias antes de se tornar realmente útil." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7226,7 +7345,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7250,12 +7369,12 @@ msgstr "" "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "Opções Periodic e Archives" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7268,12 +7387,12 @@ msgstr "" "Veja o cabeçalho deste script para uma breve documentação das suas opções." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "Opções de depuração" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7290,7 +7409,7 @@ msgstr "" "interesse para o utilizador normal, mas algumas podem ter:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7301,7 +7420,7 @@ msgstr "" "remove, purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7312,7 +7431,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como um utilizador não root." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7324,7 +7443,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7333,17 +7452,17 @@ msgstr "" "IDs de CDROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "Segue-se uma lista completa de opções de depuração para o apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7351,45 +7470,45 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7398,12 +7517,12 @@ msgstr "" "criptográficas usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7412,23 +7531,23 @@ msgstr "" "armazenados em CD-ROMs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Descreve os processos de resolver dependências de compilação no &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7437,12 +7556,12 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7453,12 +7572,12 @@ msgstr "" "para um CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7468,24 +7587,24 @@ msgstr "" "literal></quote> ao mesmo tempo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Regista no log quando os items são adicionados ou removidos da fila de " "download global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7494,12 +7613,12 @@ msgstr "" "checksums e assinaturas criptográficas dos ficheiros descarregados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7509,12 +7628,12 @@ msgstr "" "pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7523,12 +7642,12 @@ msgstr "" "do apt quando se descarrega diffs de índice em vez de índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7536,12 +7655,12 @@ msgstr "" "downloads." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7550,12 +7669,12 @@ msgstr "" "de pacotes e com a remoção de pacotes não utilizados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7570,12 +7689,12 @@ msgstr "" "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7605,22 +7724,22 @@ msgstr "" "pacote aparece." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "Despeja a configuração predefinida para o erro standard no arranque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7630,12 +7749,12 @@ msgstr "" "único." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7644,12 +7763,12 @@ msgstr "" "estado e quaisquer erros encontrados enquanto os analisa." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7658,12 +7777,12 @@ msgstr "" "literal> deve passar os pacotes ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7671,22 +7790,22 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "Escreve a prioridade da cada lista de pacote no arranque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7695,12 +7814,12 @@ msgstr "" "acontece quando é encontrado um problema de dependências complexo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7711,12 +7830,12 @@ msgstr "" "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7725,7 +7844,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7734,13 +7853,13 @@ msgstr "" "para todas as opções possíveis." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -11207,6 +11326,35 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." +#~ msgid "" +#~ "<literal>gencaches</literal> performs the same operation as <command>apt-" +#~ "get check</command>. It builds the source and package caches from the " +#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</" +#~ "filename>." +#~ msgstr "" +#~ "<literal>gencaches</literal> executa a mesma operação que o <command>apt-" +#~ "get check</command>. Constrói as caches de fonte e pacote a partir das " +#~ "fontes em &sources-list; e a partir de <filename>/var/lib/dpkg/status</" +#~ "filename>." + +#~ msgid "" +#~ "One setting is provided to control the pipeline depth in cases where the " +#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " +#~ "5 indicating how many outstanding requests APT should send. A value of " +#~ "zero MUST be specified if the remote host does not properly linger on TCP " +#~ "connections - otherwise data corruption will occur. Hosts which require " +#~ "this are in violation of RFC 2068." +#~ msgstr "" +#~ "É disponibilizada uma definição para controlar a profundidade do pipeline " +#~ "em casos onde o servidor remoto não é compatível com RFC ou é buggy (como " +#~ "o Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser " +#~ "um valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve " +#~ "enviar. TEM de ser especificado um valor de 0 se a máquina remota não " +#~ "hesitar propriamente em ligações TCP - de outro modo irá ocorrer " +#~ "corrupção de dados. As máquinas que requerem isto estão em violação de " +#~ "RFC 2068." + #, fuzzy #~| msgid "" #~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0de64b3ae..d2041eb51 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2012-05-11 17:16+0300\n" +"POT-Creation-Date: 2012-05-20 18:22+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" @@ -363,7 +363,7 @@ msgstr "" msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" -" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" +" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -434,7 +434,7 @@ msgstr "" msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" -" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n" +" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n" " </varlistentry>\n" "\">\n" msgstr "" @@ -597,18 +597,39 @@ msgid "" "synopsis-filename \"filename\">" msgstr "" +#. type: Plain text +#: apt.ent:247 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">" +msgstr "" + #. type: Plain text #: apt.ent:250 msgid "" -"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive " -"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!" -"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " -"\"section\"> <!ENTITY synopsis-override \"override\">" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-override " +"\"override-file\">" msgstr "" #. type: Plain text #: apt.ent:253 msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix " +"\"pathprefix\">" +msgstr "" + +#. type: Plain text +#: apt.ent:256 +msgid "" +"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive " +"generate section --> <!ENTITY synopsis-section \"section\">" +msgstr "" + +#. type: Plain text +#: apt.ent:259 +msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" msgstr "" @@ -680,18 +701,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:49 msgid "" -"<literal>gencaches</literal> performs the same operation as <command>apt-get " -"check</command>. It builds the source and package caches from the sources in " -"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +"<literal>gencaches</literal> creates APT's package cache. This is done " +"implicitly by all commands needing this cache if it is missing or outdated." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:55 -msgid "showpkg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:53 +#, fuzzy +msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:56 +#: apt-cache.8.xml:54 msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -705,7 +728,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> -#: apt-cache.8.xml:68 +#: apt-cache.8.xml:66 #, no-wrap msgid "" "Package: libreadline2\n" @@ -721,7 +744,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:80 +#: apt-cache.8.xml:78 msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -733,26 +756,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "stats" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:89 +#: apt-cache.8.xml:87 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:92 +#: apt-cache.8.xml:90 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:96 +#: apt-cache.8.xml:94 msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " @@ -761,7 +784,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:102 +#: apt-cache.8.xml:100 msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -772,7 +795,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:110 +#: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " @@ -781,7 +804,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:116 +#: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " @@ -790,7 +813,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:123 +#: apt-cache.8.xml:121 msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -800,7 +823,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:130 +#: apt-cache.8.xml:128 msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -810,19 +833,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> -#: apt-cache.8.xml:137 +#: apt-cache.8.xml:135 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:144 -msgid "showsrc <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:142 +#, fuzzy +msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:145 +#: apt-cache.8.xml:143 msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -830,60 +856,66 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:150 apt-config.8.xml:75 +#: apt-cache.8.xml:148 apt-config.8.xml:75 msgid "dump" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:151 +#: apt-cache.8.xml:149 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:155 +#: apt-cache.8.xml:153 msgid "dumpavail" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:156 +#: apt-cache.8.xml:154 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:160 +#: apt-cache.8.xml:158 msgid "unmet" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:161 +#: apt-cache.8.xml:159 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:165 -msgid "show <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:163 +#, fuzzy +msgid "show <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:166 +#: apt-cache.8.xml:164 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:171 -msgid "search <replaceable>regex [ regex ... ]</replaceable>" +#: apt-cache.8.xml:169 +#, fuzzy +msgid "search <replaceable>&synopsis-regex;</replaceable>…" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:172 +#: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -898,46 +930,52 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:185 +#: apt-cache.8.xml:183 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:189 -msgid "depends <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:187 +#, fuzzy +msgid "depends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:190 +#: apt-cache.8.xml:188 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:194 +#: apt-cache.8.xml:192 #, fuzzy -msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" "<programlisting>\n" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:195 +#: apt-cache.8.xml:193 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:199 -msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +#: apt-cache.8.xml:197 +#, fuzzy +msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:200 +#: apt-cache.8.xml:198 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -947,7 +985,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:205 +#: apt-cache.8.xml:203 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -955,12 +993,15 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:210 -msgid "dotty <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:208 +#, fuzzy +msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:211 +#: apt-cache.8.xml:209 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -973,7 +1014,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:220 +#: apt-cache.8.xml:218 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -982,29 +1023,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:225 +#: apt-cache.8.xml:223 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:228 -msgid "xvcg <replaceable>pkg(s)</replaceable>" +#: apt-cache.8.xml:226 +#, fuzzy +msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:229 +#: apt-cache.8.xml:227 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:233 -msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +#: apt-cache.8.xml:231 +#, fuzzy +msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]" msgstr "" +"<programlisting>\n" +"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:234 +#: apt-cache.8.xml:232 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1013,15 +1060,15 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:240 +#: apt-cache.8.xml:238 #, fuzzy -msgid "madison <replaceable>[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>&synopsis-pkg;</replaceable>…" msgstr "" "<programlisting>\n" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:241 +#: apt-cache.8.xml:239 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1033,24 +1080,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 +#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 -#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599 +#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608 msgid "options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>-p</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:256 +#: apt-cache.8.xml:254 msgid "<option>--pkg-cache</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:257 +#: apt-cache.8.xml:255 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" @@ -1058,18 +1105,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 +#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 #: apt-sortpkgs.1.xml:52 msgid "<option>-s</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:262 +#: apt-cache.8.xml:260 msgid "<option>--src-cache</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:263 +#: apt-cache.8.xml:261 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1079,17 +1126,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311 +#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311 msgid "<option>--quiet</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:271 +#: apt-cache.8.xml:269 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1098,17 +1145,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>-i</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:277 +#: apt-cache.8.xml:275 msgid "<option>--important</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:278 +#: apt-cache.8.xml:276 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1116,47 +1163,47 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:281 msgid "<option>--no-pre-depends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:284 +#: apt-cache.8.xml:282 msgid "<option>--no-depends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:285 +#: apt-cache.8.xml:283 msgid "<option>--no-recommends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:286 +#: apt-cache.8.xml:284 msgid "<option>--no-suggests</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:287 +#: apt-cache.8.xml:285 msgid "<option>--no-conflicts</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:286 msgid "<option>--no-breaks</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:287 msgid "<option>--no-replaces</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:290 +#: apt-cache.8.xml:288 msgid "<option>--no-enhances</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:291 +#: apt-cache.8.xml:289 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -1166,35 +1213,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278 +#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278 msgid "<option>-f</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:295 msgid "<option>--full</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:298 +#: apt-cache.8.xml:296 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 +#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 #: apt-get.8.xml:369 msgid "<option>-a</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:302 +#: apt-cache.8.xml:300 msgid "<option>--all-versions</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:301 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1205,17 +1252,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>-g</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:311 +#: apt-cache.8.xml:309 msgid "<option>--generate</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:312 +#: apt-cache.8.xml:310 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@ -1223,29 +1270,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 +#: apt-cache.8.xml:315 msgid "<option>--names-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:129 +#: apt-cache.8.xml:315 apt-cdrom.8.xml:129 msgid "<option>-n</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:318 +#: apt-cache.8.xml:316 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:322 +#: apt-cache.8.xml:320 msgid "<option>--all-names</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:321 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1253,12 +1300,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 +#: apt-cache.8.xml:326 msgid "<option>--recurse</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:327 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1266,12 +1313,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:332 msgid "<option>--installed</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:336 +#: apt-cache.8.xml:334 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1279,47 +1326,47 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 +#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 +#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 +#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 +#: apt.conf.5.xml:1119 apt_preferences.5.xml:697 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:346 msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 +#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 +#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 #: sources.list.5.xml:255 #, fuzzy msgid "See Also" msgstr "Consulte também" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:354 +#: apt-cache.8.xml:352 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 -#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:359 +#: apt-cache.8.xml:357 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -1626,14 +1673,16 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the tagname, %f with the complete tagname and %v with the " -"value of the option. Use uppercase letters and the respective values will " -"be quoted. Additionally %n will be replaced by a newline, %N " -"by a tab. A % can be printed by using %%." +"the name of the option, %f with the complete optionname and %v " +"with the value of the option. Use uppercase letters and special characters " +"in the value will be encoded to ensure that it can e.g. be savely used in a " +"quoted-string as defined by RFC822. Additionally %n will be replaced " +"by a newline, %N by a tab. A % can be printed by using %" +"%." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 +#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 #: apt-sortpkgs.1.xml:64 #, fuzzy msgid "&apt-conf;" @@ -1643,7 +1692,7 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:114 +#: apt-config.8.xml:115 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." @@ -1689,7 +1738,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447 +#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448 msgid "<option>-t</option>" msgstr "" @@ -2661,7 +2710,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 #: sources.list.5.xml:214 #, fuzzy msgid "Examples" @@ -3328,18 +3377,18 @@ msgstr "" #: apt-get.8.xml:400 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" -"literal>, <literal>only-upgrade</literal> will prevent packages on the " -"command line from being upgraded if they are not already installed. " +"literal>, <literal>only-upgrade</literal> will install upgrades for already " +"installed packages only and ignore requests to install new packages. " "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:406 +#: apt-get.8.xml:407 msgid "<option>--force-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:408 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -3349,12 +3398,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:414 +#: apt-get.8.xml:415 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:415 +#: apt-get.8.xml:416 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3367,12 +3416,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:426 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:427 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3381,24 +3430,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:433 +#: apt-get.8.xml:434 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:434 +#: apt-get.8.xml:435 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:438 +#: apt-get.8.xml:439 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:439 +#: apt-get.8.xml:440 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3409,17 +3458,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:448 +#: apt-get.8.xml:449 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:450 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:451 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3433,12 +3482,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:464 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:465 +#: apt-get.8.xml:466 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3447,24 +3496,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:472 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:473 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:477 +#: apt-get.8.xml:478 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:478 +#: apt-get.8.xml:479 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3473,12 +3522,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:484 +#: apt-get.8.xml:485 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:485 +#: apt-get.8.xml:486 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3490,22 +3539,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:496 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:497 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3513,24 +3562,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:501 +#: apt-get.8.xml:502 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:502 +#: apt-get.8.xml:503 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:507 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:508 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3538,14 +3587,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:520 +#: apt-get.8.xml:521 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:530 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3553,29 +3602,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:536 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:538 +#: apt-get.8.xml:539 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:539 +#: apt-get.8.xml:540 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:542 +#: apt-get.8.xml:543 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:544 +#: apt-get.8.xml:545 msgid "&apt-author.team;" msgstr "" @@ -3608,11 +3657,11 @@ msgid "add &synopsis-param-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:44 +#: apt-key.8.xml:43 msgid "" -"Add a new key to the list of trusted keys. The key is read from &synopsis-" -"param-filename;, or standard input if &synopsis-param-filename; is <literal>-" -"</literal>." +"Add a new key to the list of trusted keys. The key is read from the " +"filename given with the parameter &synopsis-param-filename; or if the " +"filename is <literal>-</literal> from standard input." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -4388,8 +4437,8 @@ msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " -"followed by an equals sign then the new value of the option. Lists can be " -"appended too by adding a trailing :: to the list name. (As you might " +"followed by an equals sign then the new value of the option. To append a new " +"element to a list, add a trailing :: to the name of the list. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" @@ -4399,7 +4448,7 @@ msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " "syntax implicit insert ::) Using both syntaxes together will trigger a bug " -"which some users unfortunately relay on: An option with the unusual name " +"which some users unfortunately depend on: An option with the unusual name " "\"<literal>::</literal>\" which acts like every other option with a name. " "These introduces many problems including that a user who writes multiple " "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " @@ -4439,20 +4488,22 @@ msgstr "" #: apt.conf.5.xml:158 msgid "" "All Architectures the system supports. Processors implementing the " -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " -"<literal>i386</literal>; This list is use when fetching files and parsing " -"package lists. The internal default is always the native architecture " -"(<literal>APT::Architecture</literal>) and all foreign architectures it can " -"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " +"set are e.g. also able to execute binaries compiled for the <literal>i386</" +"literal> (<literal>x86</literal>) instruction set; This list is use when " +"fetching files and parsing package lists. The internal default is always the " +"native architecture (<literal>APT::Architecture</literal>) and all foreign " +"architectures it can retrieve by calling <command>dpkg --print-foreign-" +"architectures</command>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:165 +#: apt.conf.5.xml:167 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:168 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4461,24 +4512,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:173 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:174 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:178 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:179 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4487,12 +4538,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:183 +#: apt.conf.5.xml:185 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:186 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4525,12 +4576,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:206 +#: apt.conf.5.xml:208 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:209 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4541,88 +4592,88 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:217 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:218 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " "to which size the Cache will grow and is therefore the amount of memory APT " "will request at startup. The default value is 20971520 bytes (~20 MB). Note " -"that these amount of space need to be available for APT otherwise it will " -"likely fail ungracefully, so for memory restricted devices these value " -"should be lowered while on systems with a lot of configured sources this " -"might be increased. <literal>Cache-Grow</literal> defines in byte with the " -"default of 1048576 (~1 MB) how much the Cache size will be increased in the " -"event the space defined by <literal>Cache-Start</literal> is not enough. " -"These value will be applied again and again until either the cache is big " -"enough to store all information or the size of the cache reaches the " -"<literal>Cache-Limit</literal>. The default of <literal>Cache-Limit</" -"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> " -"is set to 0 the automatic grow of the cache is disabled." +"that this amount of space needs to be available for APT otherwise it will " +"likely fail ungracefully, so for memory restricted devices this value should " +"be lowered while on systems with a lot of configured sources it should be " +"increased. <literal>Cache-Grow</literal> defines in bytes with the default " +"of 1048576 (~1 MB) how much the Cache size will be increased in the event " +"the space defined by <literal>Cache-Start</literal> is not enough. These " +"value will be applied again and again until either the cache is big enough " +"to store all information or the size of the cache reaches the <literal>Cache-" +"Limit</literal>. The default of <literal>Cache-Limit</literal> is 0 which " +"stands for no limit. If <literal>Cache-Grow</literal> is set to 0 the " +"automatic grow of the cache is disabled." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:231 +#: apt.conf.5.xml:233 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:234 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:237 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:238 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:242 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:243 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:247 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:248 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:254 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:259 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:260 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -4634,28 +4685,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:270 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:271 msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " "itself includes a <literal>Valid-Until</literal> header the earlier date of " "the two is used as the expiration date. The default value is <literal>0</" -"literal> which stands for \"for ever\". Archive specific settings can be " -"made by appending the label of the archive to the option name." +"literal> which stands for \"for ever valid\". Archive specific settings can " +"be made by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:279 +#: apt.conf.5.xml:281 msgid "Min-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:282 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -4666,35 +4717,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:290 +#: apt.conf.5.xml:292 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:293 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:296 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " -"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"downloaded at most to update a file. <literal>SizeLimit</literal> on the " "other hand is the maximum percentage of the size of all patches compared to " "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:303 +#: apt.conf.5.xml:305 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:306 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4704,36 +4755,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:313 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:314 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:318 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:319 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:321 sources.list.5.xml:160 +#: apt.conf.5.xml:323 sources.list.5.xml:160 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:324 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4744,7 +4795,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:332 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4758,7 +4809,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:404 +#: apt.conf.5.xml:342 apt.conf.5.xml:408 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4766,19 +4817,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:345 msgid "" -"One setting is provided to control the pipeline depth in cases where the " -"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " -"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " -"indicating how many outstanding requests APT should send. A value of zero " -"MUST be specified if the remote host does not properly linger on TCP " -"connections - otherwise data corruption will occur. Hosts which require this " -"are in violation of RFC 2068." +"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " +"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e." +"g. on high-latency connections. It specifies how many requests are send in a " +"pipeline. Previous APT versions had a default of 10 for this setting, but " +"the default value is now 0 (= disabled) to avoid problems with the ever-" +"growing amount of webservers and proxies which choose to not conform to the " +"HTTP/1.1 specification." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:352 +msgid "" +"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " +"redirects, which is enabled by default." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:355 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4788,7 +4846,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:360 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4796,12 +4854,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:366 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:367 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4811,7 +4869,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:373 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4832,12 +4890,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:387 sources.list.5.xml:171 +#: apt.conf.5.xml:391 sources.list.5.xml:171 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:392 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4856,7 +4914,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:407 +#: apt.conf.5.xml:411 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4866,7 +4924,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:418 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4875,7 +4933,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:423 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4885,18 +4943,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 sources.list.5.xml:153 +#: apt.conf.5.xml:430 sources.list.5.xml:153 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:436 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:431 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4909,12 +4967,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:441 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:442 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4922,18 +4980,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:447 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:453 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:448 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4945,19 +5003,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:458 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:461 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:454 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4974,13 +5032,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:465 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:463 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4995,7 +5053,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:470 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -5003,12 +5061,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:475 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:477 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -5017,12 +5075,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:484 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:485 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -5035,13 +5093,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:491 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -5063,32 +5121,41 @@ msgid "" "\"0\"/>" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:502 +msgid "" +"Note: To prevent problems resulting from APT being executed in different " +"environments (e.g. by different users or by other programs) all Translation " +"files which are found in <filename>/var/lib/apt/lists/</filename> will be " +"added to the end of the list (after an implicit \"<literal>none</literal>\")." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:255 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:513 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:515 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " "downloaded package lists in and <literal>status</literal> is the name of the " "dpkg status file. <literal>preferences</literal> is the name of the APT " -"preferences file. <literal>Dir::State</literal> contains the default " -"directory to prefix on all sub items if they do not start with <filename>/</" -"filename> or <filename>./</filename>." +"<filename>preferences</filename> file. <literal>Dir::State</literal> " +"contains the default directory to prefix on all sub items if they do not " +"start with <filename>/</filename> or <filename>./</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5101,7 +5168,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5111,7 +5178,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:528 +#: apt.conf.5.xml:537 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5119,7 +5186,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:541 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5130,7 +5197,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:549 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5143,7 +5210,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:553 +#: apt.conf.5.xml:562 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -5154,12 +5221,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:573 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5167,12 +5234,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:568 +#: apt.conf.5.xml:577 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:578 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5183,50 +5250,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:592 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:596 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:597 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:594 +#: apt.conf.5.xml:603 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:604 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:609 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5234,17 +5301,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:614 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:615 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5253,12 +5320,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:612 +#: apt.conf.5.xml:621 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5268,7 +5335,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:619 +#: apt.conf.5.xml:628 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5278,36 +5345,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:635 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:636 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:631 +#: apt.conf.5.xml:640 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:646 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -5322,7 +5389,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:653 +#: apt.conf.5.xml:662 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5332,7 +5399,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5346,12 +5413,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:659 +#: apt.conf.5.xml:668 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:669 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5363,12 +5430,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5384,12 +5451,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:688 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5400,12 +5467,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:695 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5415,12 +5482,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:700 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5432,12 +5499,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:708 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5449,7 +5516,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:709 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5463,12 +5530,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:729 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:730 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5477,12 +5544,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:731 +#: apt.conf.5.xml:740 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5493,7 +5560,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5501,7 +5568,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5509,7 +5576,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:759 +#: apt.conf.5.xml:768 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5519,120 +5586,120 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:767 +#: apt.conf.5.xml:776 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:777 +#: apt.conf.5.xml:786 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:791 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:806 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:846 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:850 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:857 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:870 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:880 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5640,99 +5707,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:888 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:882 +#: apt.conf.5.xml:891 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:899 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:910 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:913 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:920 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:923 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:931 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:942 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:953 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:957 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:964 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:958 +#: apt.conf.5.xml:967 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5742,12 +5809,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:978 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5764,96 +5831,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:991 +#: apt.conf.5.xml:1000 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:994 +#: apt.conf.5.xml:1003 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1010 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1004 +#: apt.conf.5.xml:1013 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1021 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1031 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1035 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1034 +#: apt.conf.5.xml:1043 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1054 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1055 +#: apt.conf.5.xml:1064 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1067 +#: apt.conf.5.xml:1076 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1070 +#: apt.conf.5.xml:1079 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5861,33 +5928,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1078 +#: apt.conf.5.xml:1087 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1082 +#: apt.conf.5.xml:1091 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1112 +#: apt.conf.5.xml:1121 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1126 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -8771,12 +8838,6 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" -#, fuzzy -#~ msgid "--keyring <replaceable>filename</replaceable>" -#~ msgstr "" -#~ "<programlisting>\n" -#~ "apt-get install <replaceable>pacote</replaceable>/testing\n" - #, fuzzy #~ msgid "to the version that is already installed (if any)." #~ msgstr "para a instância que já esteja instalada (caso exista)." -- cgit v1.2.3 From 75f37d7d27c2579ddb88f852087a54934cb00c8b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 20 May 2012 18:37:14 +0200 Subject: move the creation of the manpage-style.xsl file to the rest of the manpage building instead of doing it at setup time, so we can properly depend on it --- buildlib/po4a_manpage.mak | 6 +++++- doc/makefile | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 5814180d8..1dedd0dcd 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent cp ../apt-verbatim.ent . -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +manpage-style.xsl: ../manpage-style.xsl + sed "/<!-- LANGUAGE -->/ i\ +<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../manpage-style.xsl > manpage-style.xsl + +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed diff --git a/doc/makefile b/doc/makefile index 76e29e2b9..4c0a431fd 100644 --- a/doc/makefile +++ b/doc/makefile @@ -29,7 +29,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< @@ -42,8 +42,6 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - test -f $$i/manpage-style.xsl || sed "/<!-- LANGUAGE -->/ i\ -<xsl:param name=\"l10n.gentext.default.language\" select=\"'$$i'\" />" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule -- cgit v1.2.3 From 527df5a20dbe8ce98fcbf1ffe28bb37ff2257a97 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 20 May 2012 18:58:37 +0200 Subject: * apt-pkg/aptconfiguration.cc: - longcode Translation files are saved with encoded underscore, so make sure to pick these files up as well for Acquire::Languages --- apt-pkg/aptconfiguration.cc | 2 +- debian/changelog | 3 +++ test/libapt/assert.h | 21 +++++++++++++++++++++ test/libapt/getlanguages_test.cc | 15 +++++++++++---- test/libapt/run-tests | 3 ++- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 0fd470ed5..d763546f8 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -144,7 +144,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, if (D != 0) { builtin.push_back("none"); for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { - string const name = Ent->d_name; + string const name = SubstVar(Ent->d_name, "%5f", "_"); size_t const foundDash = name.rfind("-"); size_t const foundUnderscore = name.rfind("_", foundDash); if (foundDash == string::npos || foundUnderscore == string::npos || diff --git a/debian/changelog b/debian/changelog index c4bf881ca..5d4f8720c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,9 @@ apt (0.9.4) UNRELEASED; urgency=low * doc/*.xml: - add a few translator notes and reword some paragraphs to ensure that translators and users alike can better understand them (Closes: #669409) + * apt-pkg/aptconfiguration.cc: + - longcode Translation files are saved with encoded underscore, + so make sure to pick these files up as well for Acquire::Languages [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/test/libapt/assert.h b/test/libapt/assert.h index a07be4b57..fdf6740c6 100644 --- a/test/libapt/assert.h +++ b/test/libapt/assert.h @@ -1,6 +1,7 @@ #include <iostream> #define equals(x,y) assertEquals(y, x, __LINE__) +#define equalsNot(x,y) assertEqualsNot(y, x, __LINE__) template < typename X, typename Y > void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { @@ -14,6 +15,13 @@ void assertEquals(X expect, Y get, unsigned long const &line) { OutputAssertEqual(expect, "==", get, line); } +template < typename X, typename Y > +void assertEqualsNot(X expect, Y get, unsigned long const &line) { + if (expect != get) + return; + OutputAssertEqual(expect, "!=", get, line); +} + void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) { if (get < 0) OutputAssertEqual(expect, "==", get, line); @@ -80,6 +88,19 @@ void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line); } +#define equalsOr4(v,w,x,y,z) assertEqualsOr4(w, x, y, z, v, __LINE__) + +template < typename X, typename Y > +void OutputAssertEqualOr4(X expect1, X expect2, X expect3, X expect4, char const* compare, Y get, unsigned long const &line) { + std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« or »" << expect4 << "« " << compare << " »" << get << "« at line " << line << std::endl; +} + +template < typename X, typename Y > +void assertEqualsOr4(X expect1, X expect2, X expect3, X expect4, Y get, unsigned long const &line) { + if (expect1 == get || expect2 == get || expect3 == get || expect4 == get) + return; + OutputAssertEqualOr4(expect1, expect2, expect3, expect4, "==", get, line); +} // simple helper to quickly output a vectors template < typename X > diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index a1c801ea2..274cf4aa4 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -126,14 +126,21 @@ int main(int argc,char *argv[]) _config->Set("Dir::State::lists", argv[1]); vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 7); + equals(vec.size(), 8); equals(vec[0], "de_DE"); equals(vec[1], "de"); equals(vec[2], "en"); equals(vec[3], "none"); - equalsOr3(vec[4], "pt", "tr", "ast_DE"); - equalsOr3(vec[5], "tr", "pt", "ast_DE"); - equalsOr3(vec[6], "tr", "pt", "ast_DE"); + equalsOr4(vec[4], "pt", "tr", "ast_DE", "tlh_DE"); + equalsOr4(vec[5], "tr", "pt", "ast_DE", "tlh_DE"); + equalsOr4(vec[6], "tr", "pt", "ast_DE", "tlh_DE"); + equalsOr4(vec[7], "tr", "pt", "ast_DE", "tlh_DE"); + equalsNot(vec[4], vec[5]); + equalsNot(vec[4], vec[6]); + equalsNot(vec[4], vec[7]); + equalsNot(vec[5], vec[6]); + equalsNot(vec[5], vec[7]); + equalsNot(vec[6], vec[7]); _config->Set("Acquire::Languages", "none"); vec = APT::Configuration::getLanguages(true, false, env); diff --git a/test/libapt/run-tests b/test/libapt/run-tests index 4ea9a916d..45a3157f7 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -65,7 +65,8 @@ do "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE" + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tlh%5fDE" elif [ $name = "HashSums${EXT}" ]; then TMP="$(readlink -f "./${0}")" echo -n "Testing with ${NAME} " -- cgit v1.2.3 From 64cb607791b2235dcd2585e626329ccefc0bef77 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 20 May 2012 19:25:26 +0200 Subject: German updated (Chris Leick). Closes: #673410 --- debian/changelog | 7 + doc/po/de.po | 551 +++++++------------------------------------------------ 2 files changed, 71 insertions(+), 487 deletions(-) diff --git a/debian/changelog b/debian/changelog index ba660b726..e1c89b9ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.4) UNRELEASED; urgency=low + + [ Translation of documentation ] + * German updated (Chris Leick). Closes: #673410 + + -- Christian Perrier <bubulle@debian.org> Sun, 20 May 2012 19:24:11 +0200 + apt (0.9.3) unstable; urgency=low [ David Kalnischkies ] diff --git a/doc/po/de.po b/doc/po/de.po index 040baac57..c1db3ac79 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ # Translation of apt-doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # This file is distributed under the same license as the apt-doc package. -# Chris Leick <c.leick@vollbio.de>, 2009-2011. +# Chris Leick <c.leick@vollbio.de>, 2009-2012. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.8.15-9\n" +"Project-Id-Version: apt-doc 0.9.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-05-11 17:16+0300\n" -"PO-Revision-Date: 2011-11-13 11:21+0100\n" +"PO-Revision-Date: 2012-05-18 12:10+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -658,14 +658,14 @@ msgstr "" msgid "" "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::" "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">" -msgstr "" +msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">" #. type: Plain text #: apt.ent:217 msgid "" "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY " "synopsis-config-file \"config_file\">" -msgstr "" +msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">" #. type: Plain text #: apt.ent:220 @@ -673,49 +673,49 @@ msgid "" "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -" "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release " "\"target_release\">" -msgstr "" +msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">" #. type: Plain text #: apt.ent:223 msgid "" "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY " "synopsis-architecture \"architecture\">" -msgstr "" +msgstr "<!ENTITY synopsis-architecture \"Architektur\">" #. type: Plain text #: apt.ent:226 msgid "" "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome " "--> <!ENTITY synopsis-pkg \"pkg\">" -msgstr "" +msgstr "<!ENTITY synopsis-pkg \"Paket\">" #. type: Plain text #: apt.ent:229 msgid "" "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!" "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">" -msgstr "" +msgstr "<!ENTITY synopsis-pkg-ver-number \"Paketversionsnummer\">" #. type: Plain text #: apt.ent:232 msgid "" "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache " "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">" -msgstr "" +msgstr "<!ENTITY synopsis-prefix \"Präfix\">" #. type: Plain text #: apt.ent:235 msgid "" "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search " "awesome --> <!ENTITY synopsis-regex \"regex\">" -msgstr "" +msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">" #. type: Plain text #: apt.ent:238 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 "" +msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">" #. type: Plain text #: apt.ent:241 @@ -723,14 +723,14 @@ msgid "" "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. " "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory " "\"temporary_directory\">" -msgstr "" +msgstr "<!ENTITY synopsis-tmp-directory \"temporäres_Verzeichnis\">" #. type: Plain text #: apt.ent:244 msgid "" "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY " "synopsis-filename \"filename\">" -msgstr "" +msgstr "<!ENTITY synopsis-filename \"Dateiname\">" #. type: Plain text #: apt.ent:250 @@ -740,13 +740,16 @@ msgid "" "ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section " "\"section\"> <!ENTITY synopsis-override \"override\">" msgstr "" +"<!ENTITY synopsis-path \"Pfad\"> <!ENTITY synopsis-pathprefix \"Pfadpräfix" +"\"> <!ENTITY synopsis-section \"Abschnitt\"><!ENTITY synopsis-override " +"\"außer_Kraft_setzen\">" #. type: Plain text #: apt.ent:253 msgid "" "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export " "473041FA --> <!ENTITY synopsis-keyid \"keyid\">" -msgstr "" +msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">" #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -1447,13 +1450,6 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:291 -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be tweaked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -2000,10 +1996,8 @@ msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:89 -#, fuzzy -#| msgid "<option>-y</option>" msgid "<option>--empty</option>" -msgstr "<option>-y</option>" +msgstr "<option>--empty</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:90 @@ -2011,6 +2005,8 @@ msgid "" "Include options which have an empty value. This is the default, so use --no-" "empty to remove them from the output." msgstr "" +"schließt Optionen ein, die einen leeren Wert haben. Dies ist die Vorgabe, " +"benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:95 @@ -2018,6 +2014,8 @@ msgid "" "<option>--format '<replaceable>%f "%v";%" "n</replaceable>'</option>" msgstr "" +"<option>--format '<replaceable>%f "%v";%" +"n</replaceable>'</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:96 @@ -2028,6 +2026,13 @@ msgid "" "be quoted. Additionally %n will be replaced by a newline, %N " "by a tab. A % can be printed by using %%." msgstr "" +"definiert die Ausgabe jeder Option. %t wird durch den " +"Markierungsnamen ersetzt, %f durch den kompletten Markierungsnamen " +"und %v durch den Wert der Option. Benutzen Sie großgeschriebene " +"Buchstaben, damit die jeweiligen Werte in Anführungszeichen gesetzt werden. " +"%n wird zusätzlich durch einen Zeilenumbruch ersetzt, %N durch " +"einen Tabulator. Ein % kann mittels %% ausgegeben " +"werden." #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 @@ -3141,18 +3146,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:510 -#, fuzzy -#| msgid "" -#| "Generate the given checksum. These options default to on, when turned off " -#| "the generated index files will not have the checksum fields where " -#| "possible. Configuration Items: <literal>APT::FTPArchive::" -#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::" -#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</" -#| "replaceable></literal> where <literal><replaceable>Index</replaceable></" -#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> " -#| "or <literal>Release</literal> and <literal><replaceable>Checksum</" -#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</" -#| "literal> or <literal>SHA256</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " @@ -3709,13 +3702,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:179 -#, fuzzy -#| msgid "" -#| "If the <option>--compile</option> option is specified then the package " -#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" -#| "command> for the architecture as defined by the <command>--host-" -#| "architecture</command> option. If <option>--download-only</option> is " -#| "specified then the source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " @@ -3763,13 +3749,6 @@ msgstr "build-dep" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:198 -#, fuzzy -#| msgid "" -#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " -#| "an attempt to satisfy the build dependencies for a source package. By " -#| "default the dependencies are satisfied to build the package natively. If " -#| "desired a host-architecture can be specified with the <option>--host-" -#| "architecture</option> option instead." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " "attempt to satisfy the build dependencies for a source package. By default " @@ -3805,10 +3784,6 @@ msgstr "download" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:210 -#, fuzzy -#| msgid "" -#| "<literal>download</literal> will download the given binary package into " -#| "the current directory." msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." @@ -3867,11 +3842,6 @@ msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:236 -#, fuzzy -#| msgid "" -#| "<literal>autoremove</literal> is used to remove packages that were " -#| "automatically installed to satisfy dependencies for other packages and " -#| "are now no longer needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -4137,23 +4107,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:353 -#, fuzzy -#| msgid "<option>--assume-yes</option>" msgid "<option>--assume-no</option>" -msgstr "<option>--assume-yes</option>" +msgstr "<option>--assume-no</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:354 -#, fuzzy -#| msgid "" -#| "Compile source packages after downloading them. Configuration Item: " -#| "<literal>APT::Get::Compile</literal>." msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." msgstr "" -"Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. " -"Konfigurationselement: <literal>APT::Get::Compile</literal>." +"automatisches »nein« auf alle Anfragen. Konfigurationselement: <literal>APT::" +"Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:358 @@ -4647,49 +4611,39 @@ msgstr "Befehle" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:40 msgid "add &synopsis-param-filename;" -msgstr "" +msgstr "&synopsis-param-filename; hinzufügen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:44 -#, fuzzy -#| msgid "" -#| "Add a new key to the list of trusted keys. The key is read from " -#| "<replaceable>filename</replaceable>, or standard input if " -#| "<replaceable>filename</replaceable> is <literal>-</literal>." msgid "" "Add a new key to the list of trusted keys. The key is read from &synopsis-" "param-filename;, or standard input if &synopsis-param-filename; is <literal>-" "</literal>." msgstr "" "Einen neuen Schlüssel zur Liste der vertrauenswürdigen Schlüssel hinzufügen. " -"Der Schlüssel wird aus <replaceable>Dateiname</replaceable> gelesen oder, " -"wenn <replaceable>Dateiname</replaceable> <literal>-</literal> ist, von der " -"Standardeingabe." +"Der Schlüssel wird aus &synopsis-param-filename; gelesen oder, wenn " +"&synopsis-param-filename; <literal>-</literal> ist, von der Standardeingabe." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:52 msgid "del &synopsis-param-keyid;" -msgstr "" +msgstr "del &synopsis-param-keyid;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:56 msgid "Remove a key from the list of trusted keys." msgstr "" -"Einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen." +"einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:63 msgid "export &synopsis-param-keyid;" -msgstr "" +msgstr "export &synopsis-param-keyid;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:67 -#, fuzzy -#| msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgid "Output the key &synopsis-param-keyid; to standard output." -msgstr "" -"Den Schlüssel <replaceable>Schlüssel-ID</replaceable> auf der " -"Standardausgabe ausgeben." +msgstr "den Schlüssel &synopsis-param-keyid; auf der Standardausgabe ausgeben" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:74 @@ -4699,7 +4653,7 @@ msgstr "exportall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:78 msgid "Output all trusted keys to standard output." -msgstr "Alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben." +msgstr "alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:85 @@ -4709,7 +4663,7 @@ msgstr "list" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:89 msgid "List trusted keys." -msgstr "Vertrauenswürdige Schlüssel auflisten." +msgstr "vertrauenswürdige Schlüssel auflisten" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:96 @@ -4719,7 +4673,7 @@ msgstr "finger" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:100 msgid "List fingerprints of trusted keys." -msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten." +msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:107 @@ -4732,7 +4686,7 @@ msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" -"Erweitere Optionen an gpg weiterleiten. Mit adv --recv-key können Sie den " +"erweiterte Optionen an gpg weiterleiten. Mit adv --recv-key können Sie den " "öffentlichen Schlüssel herunterladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4744,7 +4698,7 @@ msgid "" "distribution, e.g. the <literal>debian-archive-keyring</literal> package in " "Debian." msgstr "" -"Aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und " +"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und " "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen " "Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-" "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket " @@ -4757,14 +4711,6 @@ msgstr "net-update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:137 -#, fuzzy -#| msgid "" -#| "Work similar to the <command>update</command> command above, but get the " -#| "archive keyring from an URI instead and validate it against a master " -#| "key. This requires an installed &wget; and an APT build configured to " -#| "have a server to fetch from and a master keyring to validate. APT in " -#| "Debian does not support this command and relies on <command>update</" -#| "command> instead, but Ubuntu's APT does." msgid "" "Work similar to the <command>update</command> command above, but get the " "archive keyring from an URI instead and validate it against a master key. " @@ -4793,18 +4739,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:156 msgid "--keyring &synopsis-param-filename;" -msgstr "" +msgstr "--keyring &synopsis-param-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:157 -#, fuzzy -#| msgid "" -#| "With this option it is possible to specify a specific keyring file the " -#| "command should operate on. The default is that a command is executed on " -#| "the <filename>trusted.gpg</filename> file as well as on all parts in the " -#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted." -#| "gpg</filename> is the primary keyring which means that e.g. new keys are " -#| "added to this one." msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -5366,14 +5304,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:191 -#, fuzzy -#| msgid "" -#| "For more background information you might want to review the <ulink url=" -#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" -#| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " -#| "Manual (available also in the harden-doc package) and the <ulink url=" -#| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " -#| "Distribution HOWTO</ulink> by V. Alex Brennen." msgid "" "For more background information you might want to review the <ulink url=" "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian " @@ -5383,7 +5313,7 @@ msgid "" "ulink> by V. Alex Brennen." msgstr "" "Um weitere Hintergrundinformationen zu erhalten, können Sie die <ulink url=" -"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.de.html\">Die " +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Die " "Infrastruktur für Sicherheit in Debian</ulink>-Kapitel des Handbuchs " "»Anleitung zum Absichern von Debian« (auch verfügbar im Paket harden-doc) " "und dem <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" " @@ -5518,15 +5448,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 -#, fuzzy -#| msgid "" -#| "all files in <literal>Dir::Etc::Parts</literal> in 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> configuration list - in this case it will " -#| "be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " "order which have either no or \"<literal>conf</literal>\" as filename " @@ -6103,15 +6024,6 @@ msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:269 -#, fuzzy -#| msgid "" -#| "Minimum of seconds the Release file should be considered valid after it " -#| "was created (indicated by the <literal>Date</literal> header). Use this " -#| "if you need to use a seldomly updated (local) mirror of a more regular " -#| "updated archive with a <literal>Valid-Until</literal> header instead of " -#| "completely disabling the expiration date checking. Archive specific " -#| "settings can and should be used by appending the label of the archive to " -#| "the option name." msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " @@ -6120,14 +6032,13 @@ msgid "" "literal> which stands for \"for ever\". Archive specific settings can be " "made by appending the label of the archive to the option name." msgstr "" -"Minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet " -"werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile " -"<literal>Date</literal>). Benutzen Sie dies, falls Sie einen selten " -"aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten Archivs " -"mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt die " -"Überprüfung des Ablaufdatum komplett zu deaktivieren. Archivspezifische " -"Einstellungen können und sollten durch Anhängen des Archivetiketts an die " -"Option »name« vorgenommen werden." +"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem " +"sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</literal>). " +"Falls die Release-Datei selbst eine <literal>Valid-Until</literal>-Kopfzeile " +"enthält, wird das frühere der beiden Daten als Ablaufdatum verwandt. Vorgabe " +"ist <literal>0</literal>, was für »für immer« steht. Archivspezifische " +"Einstellungen können durch Anhängen des Archivetiketts an den Optionsnamen " +"vorgenommen werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:279 @@ -6150,8 +6061,8 @@ msgstr "" "aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten Archivs " "mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt die " "Überprüfung des Ablaufdatum komplett zu deaktivieren. Archivspezifische " -"Einstellungen können und sollten durch Anhängen des Archivetiketts an die " -"Option »name« vorgenommen werden." +"Einstellungen können und sollten durch Anhängen des Archivetiketts an den " +"Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:290 @@ -6170,14 +6081,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:294 -#, fuzzy -#| msgid "" -#| "Two sub-options to limit the use of PDiffs are also available: With " -#| "<literal>FileLimit</literal> can be specified how many PDiff files are " -#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the " -#| "other hand is the maximum percentage of the size of all patches compared " -#| "to the size of the targeted file. If one of these limits is exceeded the " -#| "complete file is downloaded instead of the patches." msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6629,18 +6532,6 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:459 -#, fuzzy -#| msgid "" -#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" -#| "replaceable></literal> will be checked: If this setting exists the method " -#| "will only be used if this file exists, e.g. for the bzip2 method (the " -#| "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -#| "also that list entries specified on the command line will be added at the " -#| "end of the list specified in the configuration files, but before the " -#| "default entries. To prefer a type in this case over the ones specified in " -#| "the configuration files you can set the option direct - not in list " -#| "style. This will not override the defined list, it will only prefix the " -#| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6667,12 +6558,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:466 -#, fuzzy -#| msgid "" -#| "The special type <literal>uncompressed</literal> can be used to give " -#| "uncompressed files a preference, but note that most archives don't " -#| "provide uncompressed files so this is mostly only useable for local " -#| "mirrors." msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -7960,16 +7845,6 @@ 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 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> 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 " @@ -8431,13 +8306,6 @@ msgstr "Reguläre Ausdrücke und glob()-Syntax" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:264 -#, fuzzy -#| 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)." msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " @@ -8466,11 +8334,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:279 -#, fuzzy -#| 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." 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 " @@ -9387,8 +9250,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, fuzzy, no-wrap -#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#, no-wrap msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]" @@ -9502,6 +9364,13 @@ msgid "" "and trusted context. <literal>trusted=no</literal> is the opposite which " "handles even correctly authenificated sources as not authenificated." msgstr "" +"<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass " +"Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die Datei " +"<filename>Release</filename> nicht signiert ist oder die Signatur nicht " +"geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte " +"daher nur in lokalem und vertrauenswürdigem Kontext benutzt werden. " +"<literal>trusted=no</literal> ist das Gegenteil davon. Es handhabt sogar " +"korrekt authentifizierte Quellen als nicht authentifiziert." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:128 @@ -11375,295 +11244,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." - -#~ msgid "" -#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " -#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" " -#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc " -#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></" -#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> " -#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</" -#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " -#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain" -#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " -#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </" -#~ "group>" -#~ msgstr "" -#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " -#~ "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></" -#~ "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></" -#~ "arg> <group choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" -#~ "replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</" -#~ "arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" -#~ "\"><replaceable>regulärer_Ausdruck</replaceable></arg></arg> <arg>show " -#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></" -#~ "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg>rdepends <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg>pkgnames <arg choice=\"plain\"><replaceable>Präfix</replaceable></" -#~ "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg>xvcg <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>Pakete</" -#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Pakete</replaceable></arg></arg> </group>" - -#~ msgid "" -#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " -#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></" -#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></" -#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> " -#~ "<group> <arg>add</arg> <arg>ident</arg> </group>" -#~ msgstr "" -#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " -#~ "<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></" -#~ "arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</" -#~ "replaceable></option></arg><arg><option>-c=<replaceable>Datei</" -#~ "replaceable></option></arg><group><arg>hinzufügen</" -#~ "arg><arg>Identifikation</arg></group>" - -#~ msgid "" -#~ "<command>apt-config</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" -#~ msgstr "" -#~ "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-" -#~ "o=<replaceable>Konfigurationszeichenkette</replaceable></option></" -#~ "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group " -#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" - -#~ msgid "" -#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></" -#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</" -#~ "replaceable></arg>" -#~ msgstr "" -#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-t=<replaceable>temporäres Verzeichnis</replaceable></" -#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</" -#~ "replaceable></arg>" - -#~ msgid "" -#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " -#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " -#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" -#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></" -#~ "option></arg> <arg><option>-o <replaceable>config</" -#~ "replaceable>=<replaceable>string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" -#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " -#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" -#~ "replaceable></arg><arg><replaceable>override</" -#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " -#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" -#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" -#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain" -#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" -#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " -#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" -#~ "group>" -#~ msgstr "" -#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " -#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " -#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" -#~ "arg> <arg><option>--arch <replaceable>Architektur</replaceable></option></" -#~ "arg> <arg><option>-o <replaceable>Konfiguration</" -#~ "replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group " -#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</" -#~ "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> " -#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</" -#~ "replaceable></arg><arg><replaceable>überschreiben</" -#~ "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> " -#~ "<arg>contents <arg choice=\"plain\"><replaceable>Pfad</replaceable></" -#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>Pfad</" -#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain" -#~ "\"><replaceable>Konfigurationsdatei</replaceable></arg> <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Abschnitt</replaceable></arg></arg> " -#~ "<arg>clean <arg choice=\"plain\"><replaceable>Konfigurationsdatei</" -#~ "replaceable></arg></arg> </group>" - -#, fuzzy -#~| msgid "" -#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " -#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " -#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </" -#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> " -#~| "<replaceable>target_release</replaceable> </arg> </arg> <arg> <option>-" -#~| "a=</option> <arg choice='plain'> <replaceable>default_architecture</" -#~| "replaceable> </arg> </arg> <group choice=\"req\"> <arg " -#~| "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -#~| "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" -#~| "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" -#~| "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " -#~| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " -#~| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=" -#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" -#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " -#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> " -#~| "<arg> <group choice='req'> <arg choice='plain'> " -#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " -#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" -#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " -#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " -#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " -#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " -#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" -#~| "help</arg> </group> </arg> </group>" -#~ msgid "" -#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " -#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " -#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " -#~ "<arg> <option>-t=</option> <arg choice='plain'> " -#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice=" -#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" -#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" -#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" -#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " -#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " -#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain" -#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " -#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " -#~ "<group choice='req'> <arg choice='plain'> " -#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg " -#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" -#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " -#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " -#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " -#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " -#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " -#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" -#~ "help</arg> </group> </arg> </group>" -#~ msgstr "" -#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " -#~ "<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </" -#~ "option> </arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</" -#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg " -#~ "choice='plain'> <replaceable>Ziel-Release</replaceable> </arg> </arg> " -#~ "<arg> <option>-a=</option> <arg choice='plain'> " -#~ "<replaceable>Vorgabearchitektur</replaceable> </arg> </arg> <group choice=" -#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" -#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" -#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" -#~ "\"repeat\"><replaceable>Paket</replaceable> <arg> <group choice='req'> " -#~ "<arg choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </" -#~ "arg> <arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> " -#~ "</group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg " -#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat" -#~ "\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg " -#~ "choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> " -#~ "<arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </" -#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" -#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " -#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " -#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " -#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " -#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" -#~ "help</arg> </group> </arg> </group>" - -#~ msgid "" -#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" -#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " -#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" -#~ "option></arg>" -#~ msgstr "" -#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>Dateiname</" -#~ "replaceable></option></arg> <arg><replaceable>Befehl</replaceable></arg> " -#~ "<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></" -#~ "option></arg>" - -#~ msgid "add <replaceable>filename</replaceable>" -#~ msgstr "add <replaceable>Dateiname</replaceable>" - -#~ msgid "del <replaceable>keyid</replaceable>" -#~ msgstr "del <replaceable>Schlüssel-ID</replaceable>" - -#~ msgid "export <replaceable>keyid</replaceable>" -#~ msgstr "export <replaceable>Schlüssel-ID</replaceable>" - -#~ msgid "--keyring <replaceable>filename</replaceable>" -#~ msgstr "--keyring <replaceable>Dateiname</replaceable>" - -#~ msgid "" -#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg " -#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </" -#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#~ "replaceable></arg> </arg> </group>" -#~ msgstr "" -#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#~ "<arg><option>-f=<replaceable>DATEINAME</replaceable></option></arg> " -#~ "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> " -#~ "<arg choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg " -#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </" -#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" -#~ "replaceable></arg> </arg> </group>" - -#~ msgid "" -#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " -#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg " -#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" -#~ msgstr "" -#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " -#~ "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></" -#~ "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></" -#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</" -#~ "replaceable></arg>" - -#, fuzzy -#~| msgid "" -#~| "Seconds the Release file should be considered valid after it was created " -#~| "(indicated by the <literal>Date</literal> header). If the Release file " -#~| "itself includes a <literal>Valid-Until</literal> header the earlier date " -#~| "of the two is used as the expiration date. The default value is " -#~| "<literal>0</literal> which stands for \"for ever\". Archive specific " -#~| "settings can be made by appending the label of the archive to the option " -#~| "name." -#~ msgid "" -#~ "Seconds the Release file should be considered valid after it was created. " -#~ "The default is \"for ever\" (0) if the Release file of the archive " -#~ "doesn't include a <literal>Valid-Until</literal> header. If it does then " -#~ "this date is the default. The date from the Release file or the date " -#~ "specified by the creation time of the Release file (<literal>Date</" -#~ "literal> header) plus the seconds specified with this options are used to " -#~ "check if the validation of a file has expired by using the earlier date " -#~ "of the two. Archive specific settings can be made by appending the label " -#~ "of the archive to the option name." -#~ msgstr "" -#~ "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, " -#~ "nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</" -#~ "literal>). Falls die Release-Datei selbst eine <literal>Valid-Until</" -#~ "literal>-Kopfzeile enhält, wird der frühere von beiden Terminen als " -#~ "Verfallsdatum benutzt. Vorgabewert ist <literal>0</literal>, was »für " -#~ "immer« bedeutet. Archivspezifische Einstellungen können durch Anhängen " -#~ "des Archivetiketts an die Option »name« vorgenommen werden." -- cgit v1.2.3 From 2b9b27c395d75a0c06e7eca65746e5567e459dac Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 21 May 2012 04:40:48 +0200 Subject: in <term> mark all options with <option> and mark <term><option> as untranslated for po4a removing ~200 unless "translateable" strings --- debian/changelog | 2 + doc/apt-cache.8.xml | 32 +- doc/apt-cdrom.8.xml | 4 +- doc/apt-config.8.xml | 4 +- doc/apt-extracttemplates.1.xml | 5 +- doc/apt-ftparchive.1.xml | 100 +-- doc/apt-get.8.xml | 34 +- doc/apt-key.8.xml | 20 +- doc/apt-mark.8.xml | 24 +- doc/apt.conf.5.xml | 138 +-- doc/apt_preferences.5.xml | 3 +- doc/po/apt-doc.pot | 1478 +++--------------------------- doc/po/de.po | 1561 ++++---------------------------- doc/po/es.po | 1874 ++++---------------------------------- doc/po/fr.po | 1852 ++++---------------------------------- doc/po/it.po | 1510 ++++--------------------------- doc/po/ja.po | 1926 ++++----------------------------------- doc/po/pl.po | 1927 ++++------------------------------------ doc/po/pt.po | 1868 ++++---------------------------------- doc/po/pt_BR.po | 1584 ++++----------------------------- doc/po4a.conf | 31 +- 21 files changed, 1733 insertions(+), 14244 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d4f8720c..d28b525b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ apt (0.9.4) UNRELEASED; urgency=low * doc/*.xml: - add a few translator notes and reword some paragraphs to ensure that translators and users alike can better understand them (Closes: #669409) + - in <term> mark all options with <option> and mark <term><option> + as untranslated for po4a removing ~200 unless "translateable" strings * apt-pkg/aptconfiguration.cc: - longcode Translation files are saved with encoded underscore, so make sure to pick these files up as well for Acquire::Languages diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index dd0ea6e9d..3029512db 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -45,12 +45,12 @@ commands below must be present.</para> <variablelist> - <varlistentry><term>gencaches</term> + <varlistentry><term><option>gencaches</option></term> <listitem><para><literal>gencaches</literal> creates APT's package cache. This is done implicitly by all commands needing this cache if it is missing or outdated.</para></listitem> </varlistentry> - <varlistentry><term>showpkg <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>showpkg</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>showpkg</literal> displays information about the packages listed on the command line. Remaining arguments are package names. The available versions and reverse dependencies of each package listed are listed, as @@ -84,7 +84,7 @@ Reverse Provides: is best to consult the apt source code.</para></listitem> </varlistentry> - <varlistentry><term>stats</term><listitem><para><literal>stats</literal> displays some statistics about the cache. + <varlistentry><term><option>stats</option></term><listitem><para><literal>stats</literal> displays some statistics about the cache. No further arguments are expected. Statistics reported are: <itemizedlist> <listitem><para><literal>Total package names</literal> is the number of package names found @@ -139,34 +139,34 @@ Reverse Provides: </para></listitem> </varlistentry> - <varlistentry><term>showsrc <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>showsrc</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>showsrc</literal> displays all the source package records that match the given package names. All versions are shown, as well as all records that declare the name to be a Binary.</para></listitem> </varlistentry> - <varlistentry><term>dump</term> + <varlistentry><term><option>dump</option></term> <listitem><para><literal>dump</literal> shows a short listing of every package in the cache. It is primarily for debugging.</para></listitem> </varlistentry> - <varlistentry><term>dumpavail</term> + <varlistentry><term><option>dumpavail</option></term> <listitem><para><literal>dumpavail</literal> prints out an available list to stdout. This is suitable for use with &dpkg; and is used by the &dselect; method.</para></listitem> </varlistentry> - <varlistentry><term>unmet</term> + <varlistentry><term><option>unmet</option></term> <listitem><para><literal>unmet</literal> displays a summary of all unmet dependencies in the package cache.</para></listitem> </varlistentry> - <varlistentry><term>show <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>show</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>show</literal> performs a function similar to <command>dpkg --print-avail</command>; it displays the package records for the named packages.</para></listitem> </varlistentry> - <varlistentry><term>search <replaceable>&synopsis-regex;</replaceable>…</term> + <varlistentry><term><option>search</option> <option><replaceable>&synopsis-regex;</replaceable>…</option></term> <listitem><para><literal>search</literal> performs a full text search on all available package lists for the POSIX regex pattern given, see <citerefentry><refentrytitle><command>regex</command></refentrytitle> @@ -184,17 +184,17 @@ Reverse Provides: are and'ed together.</para></listitem> </varlistentry> - <varlistentry><term>depends <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>depends</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>depends</literal> shows a listing of each dependency a package has and all the possible other packages that can fulfill that dependency.</para></listitem> </varlistentry> - <varlistentry><term>rdepends <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>rdepends</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a package has.</para></listitem> </varlistentry> - <varlistentry><term>pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]</term> + <varlistentry><term><option>pkgnames</option> <optional><replaceable>&synopsis-prefix;</replaceable></optional></term> <listitem><para>This command prints the name of each package APT knows. The optional argument is a prefix match to filter the name list. The output is suitable for use in a shell tab complete function and the output is generated @@ -205,7 +205,7 @@ Reverse Provides: </para></listitem> </varlistentry> - <varlistentry><term>dotty <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>dotty</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>dotty</literal> takes a list of packages on the command line and generates output suitable for use by dotty from the <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink> @@ -223,19 +223,19 @@ Reverse Provides: <para>Caution, dotty cannot graph larger sets of packages.</para></listitem> </varlistentry> - <varlistentry><term>xvcg <replaceable>&synopsis-pkg;</replaceable></term> + <varlistentry><term><option>xvcg</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para>The same as <literal>dotty</literal>, only for xvcg from the <ulink url="http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html">VCG tool</ulink>. </para></listitem></varlistentry> - <varlistentry><term>policy [ <replaceable>&synopsis-pkg;</replaceable>… ]</term> + <varlistentry><term><option>policy</option> <optional><replaceable>&synopsis-pkg;</replaceable>…</optional></term> <listitem><para><literal>policy</literal> is meant to help debug issues relating to the preferences file. With no arguments it will print out the priorities of each source. Otherwise it prints out detailed information about the priority selection of the named package.</para></listitem> </varlistentry> - <varlistentry><term>madison <replaceable>&synopsis-pkg;</replaceable>…</term> + <varlistentry><term><option>madison</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term> <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic the output format and a subset of the functionality of the Debian archive management tool, <literal>madison</literal>. It displays diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 94fc6fd8b..969491740 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -52,7 +52,7 @@ given one of the commands below must be present. <variablelist> - <varlistentry><term>add</term> + <varlistentry><term><option>add</option></term> <listitem><para><literal>add</literal> is used to add a new disc to the source list. It will unmount the CDROM device, prompt for a disk to be inserted and then proceed to @@ -68,7 +68,7 @@ </listitem> </varlistentry> - <varlistentry><term>ident</term> + <varlistentry><term><option>ident</option></term> <listitem><para>A debugging tool to report the identity of the current disc as well as the stored file name </para> diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 0295cb193..94c247dd1 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -46,7 +46,7 @@ </para> <variablelist> - <varlistentry><term>shell</term> + <varlistentry><term><option>shell</option></term> <listitem><para> shell is used to access the configuration information from a shell script. It is given pairs of arguments, the first being a shell @@ -72,7 +72,7 @@ eval $RES </listitem> </varlistentry> - <varlistentry><term>dump</term> + <varlistentry><term><option>dump</option></term> <listitem><para> Just show the contents of the configuration space.</para> </listitem> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 8f28f8c54..f1f316822 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -43,8 +43,9 @@ in the format:</para> <para>package version template-file config-script</para> <para>template-file and config-script are written to the temporary directory - specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</literal>) - directory, with filenames of the form <filename>package.template.XXXX</filename> and + specified by the <option>-t</option> or <option>--tempdir</option> + (<literal>APT::ExtractTemplates::TempDir</literal>) directory, + with filenames of the form <filename>package.template.XXXX</filename> and <filename>package.config.XXXX</filename></para> </refsect1> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 93b109af1..fbc3afb10 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -55,7 +55,7 @@ commands below must be present.</para> <variablelist> - <varlistentry><term>packages</term> + <varlistentry><term><option>packages</option></term> <listitem><para> The packages command generates a package file from a directory tree. It takes the given directory and recursively searches it for .deb files, @@ -65,7 +65,7 @@ <para>The option <option>--db</option> can be used to specify a binary caching DB.</para></listitem> </varlistentry> - <varlistentry><term>sources</term> + <varlistentry><term><option>sources</option></term> <listitem><para> The <literal>sources</literal> command generates a source index file from a directory tree. It takes the given directory and recursively searches it for .dsc files, @@ -77,7 +77,7 @@ used to change the source override file that will be used.</para></listitem> </varlistentry> - <varlistentry><term>contents</term> + <varlistentry><term><option>contents</option></term> <listitem><para> The <literal>contents</literal> command generates a contents file from a directory tree. It takes the given directory and recursively searches it for .deb files, @@ -89,7 +89,7 @@ The option <option>--db</option> can be used to specify a binary caching DB.</para></listitem> </varlistentry> - <varlistentry><term>release</term> + <varlistentry><term><option>release</option></term> <listitem><para> The <literal>release</literal> command generates a Release file from a directory tree. It recursively searches the given directory for uncompressed @@ -112,7 +112,7 @@ </varlistentry> - <varlistentry><term>generate</term> + <varlistentry><term><option>generate</option></term> <listitem><para> The <literal>generate</literal> command is designed to be runnable from a cron script and builds indexes according to the given config file. The config language @@ -121,7 +121,7 @@ required settings.</para></listitem> </varlistentry> - <varlistentry><term>clean</term> + <varlistentry><term><option>clean</option></term> <listitem><para> The <literal>clean</literal> command tidies the databases used by the given configuration file by removing any records that are no longer necessary.</para></listitem> @@ -148,24 +148,24 @@ directories are prepended certain relative paths defined in later sections to produce a complete an absolute path.</para> <variablelist> - <varlistentry><term>ArchiveDir</term> + <varlistentry><term><option>ArchiveDir</option></term> <listitem><para> Specifies the root of the FTP archive, in a standard Debian configuration this is the directory that contains the <filename>ls-LR</filename> and dist nodes.</para></listitem> </varlistentry> - <varlistentry><term>OverrideDir</term> + <varlistentry><term><option>OverrideDir</option></term> <listitem><para> Specifies the location of the override files.</para></listitem> </varlistentry> - <varlistentry><term>CacheDir</term> + <varlistentry><term><option>CacheDir</option></term> <listitem><para> Specifies the location of the cache files</para></listitem> </varlistentry> - <varlistentry><term>FileListDir</term> + <varlistentry><term><option>FileListDir</option></term> <listitem><para> Specifies the location of the file list files, if the <literal>FileList</literal> setting is used below.</para></listitem> @@ -179,7 +179,7 @@ that control the operation of the generator. Other sections may override these defaults with a per-section setting.</para> <variablelist> - <varlistentry><term>Packages::Compress</term> + <varlistentry><term><option>Packages::Compress</option></term> <listitem><para> Sets the default compression schemes to use for the Package index files. It is a string that contains a space @@ -187,51 +187,51 @@ 'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem> </varlistentry> - <varlistentry><term>Packages::Extensions</term> + <varlistentry><term><option>Packages::Extensions</option></term> <listitem><para> Sets the default list of file extensions that are package files. This defaults to '.deb'.</para></listitem> </varlistentry> - <varlistentry><term>Sources::Compress</term> + <varlistentry><term><option>Sources::Compress</option></term> <listitem><para> This is similar to <literal>Packages::Compress</literal> except that it controls the compression for the Sources files.</para></listitem> </varlistentry> - <varlistentry><term>Sources::Extensions</term> + <varlistentry><term><option>Sources::Extensions</option></term> <listitem><para> Sets the default list of file extensions that are source files. This defaults to '.dsc'.</para></listitem> </varlistentry> - <varlistentry><term>Contents::Compress</term> + <varlistentry><term><option>Contents::Compress</option></term> <listitem><para> This is similar to <literal>Packages::Compress</literal> except that it controls the compression for the Contents files.</para></listitem> </varlistentry> - <varlistentry><term>Translation::Compress</term> + <varlistentry><term><option>Translation::Compress</option></term> <listitem><para> This is similar to <literal>Packages::Compress</literal> except that it controls the compression for the Translation-en master file.</para></listitem> </varlistentry> - <varlistentry><term>DeLinkLimit</term> + <varlistentry><term><option>DeLinkLimit</option></term> <listitem><para> Specifies the number of kilobytes to delink (and replace with hard links) per run. This is used in conjunction with the per-section <literal>External-Links</literal> setting.</para></listitem> </varlistentry> - <varlistentry><term>FileMode</term> + <varlistentry><term><option>FileMode</option></term> <listitem><para> Specifies the mode of all created index files. It defaults to 0644. All index files are set to this mode with no regard to the umask.</para></listitem> </varlistentry> - <varlistentry><term>LongDescription</term> + <varlistentry><term><option>LongDescription</option></term> <listitem><para> Sets if long descriptions should be included in the Packages file or split out into a master Translation-en file.</para></listitem> @@ -246,14 +246,14 @@ $(SECTION) and $(ARCH) replaced with their respective values.</para> <variablelist> - <varlistentry><term>MaxContentsChange</term> + <varlistentry><term><option>MaxContentsChange</option></term> <listitem><para> Sets the number of kilobytes of contents files that are generated each day. The contents files are round-robined so that over several days they will all be rebuilt.</para></listitem> </varlistentry> - <varlistentry><term>ContentsAge</term> + <varlistentry><term><option>ContentsAge</option></term> <listitem><para> Controls the number of days a contents file is allowed to be checked without changing. If this limit is passed the mtime of the @@ -264,45 +264,45 @@ the units are in days.</para></listitem> </varlistentry> - <varlistentry><term>Directory</term> + <varlistentry><term><option>Directory</option></term> <listitem><para> Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem> </varlistentry> - <varlistentry><term>SrcDirectory</term> + <varlistentry><term><option>SrcDirectory</option></term> <listitem><para> Sets the top of the source package directory tree. Defaults to <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem> </varlistentry> - <varlistentry><term>Packages</term> + <varlistentry><term><option>Packages</option></term> <listitem><para> Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem> </varlistentry> - <varlistentry><term>Sources</term> + <varlistentry><term><option>Sources</option></term> <listitem><para> Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> - <varlistentry><term>Translation</term> + <varlistentry><term><option>Translation</option></term> <listitem><para> Set the output Translation-en master file with the long descriptions if they should be not included in the Packages file. Defaults to <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename></para></listitem> </varlistentry> - <varlistentry><term>InternalPrefix</term> + <varlistentry><term><option>InternalPrefix</option></term> <listitem><para> Sets the path prefix that causes a symlink to be considered an internal link instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</filename></para></listitem> </varlistentry> - <varlistentry><term>Contents</term> + <varlistentry><term><option>Contents</option></term> <listitem><para> Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple @@ -311,25 +311,25 @@ together automatically.</para></listitem> </varlistentry> - <varlistentry><term>Contents::Header</term> + <varlistentry><term><option>Contents::Header</option></term> <listitem><para> Sets header file to prepend to the contents output.</para></listitem> </varlistentry> - <varlistentry><term>BinCacheDB</term> + <varlistentry><term><option>BinCacheDB</option></term> <listitem><para> Sets the binary cache database to use for this section. Multiple sections can share the same database.</para></listitem> </varlistentry> - <varlistentry><term>FileList</term> + <varlistentry><term><option>FileList</option></term> <listitem><para> Specifies that instead of walking the directory tree, <command>apt-ftparchive</command> should read the list of files from the given file. Relative files names are prefixed with the archive directory.</para></listitem> </varlistentry> - <varlistentry><term>SourceFileList</term> + <varlistentry><term><option>SourceFileList</option></term> <listitem><para> Specifies that instead of walking the directory tree, <command>apt-ftparchive</command> should read the list of files from the given @@ -363,44 +363,44 @@ for i in Sections do </programlisting></para> <variablelist> - <varlistentry><term>Sections</term> + <varlistentry><term><option>Sections</option></term> <listitem><para> This is a space separated list of sections which appear under the distribution, typically this is something like <literal>main contrib non-free</literal></para></listitem> </varlistentry> - <varlistentry><term>Architectures</term> + <varlistentry><term><option>Architectures</option></term> <listitem><para> This is a space separated list of all the architectures that appear under search section. The special architecture 'source' is used to indicate that this tree has a source archive.</para></listitem> </varlistentry> - <varlistentry><term>LongDescription</term> + <varlistentry><term><option>LongDescription</option></term> <listitem><para> Sets if long descriptions should be included in the Packages file or split out into a master Translation-en file.</para></listitem> </varlistentry> - <varlistentry><term>BinOverride</term> + <varlistentry><term><option>BinOverride</option></term> <listitem><para> Sets the binary override file. The override file contains section, priority and maintainer address information.</para></listitem> </varlistentry> - <varlistentry><term>SrcOverride</term> + <varlistentry><term><option>SrcOverride</option></term> <listitem><para> Sets the source override file. The override file contains section information.</para></listitem> </varlistentry> - <varlistentry><term>ExtraOverride</term> + <varlistentry><term><option>ExtraOverride</option></term> <listitem><para> Sets the binary extra override file.</para></listitem> </varlistentry> - <varlistentry><term>SrcExtraOverride</term> + <varlistentry><term><option>SrcExtraOverride</option></term> <listitem><para> Sets the source extra override file.</para></listitem> </varlistentry> @@ -415,53 +415,53 @@ for i in Sections do section with no substitution variables or <literal>Section</literal><literal>Architecture</literal> settings.</para> <variablelist> - <varlistentry><term>Packages</term> + <varlistentry><term><option>Packages</option></term> <listitem><para> Sets the Packages file output.</para></listitem> </varlistentry> - <varlistentry><term>Sources</term> + <varlistentry><term><option>Sources</option></term> <listitem><para> Sets the Sources file output. At least one of <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem> </varlistentry> - <varlistentry><term>Contents</term> + <varlistentry><term><option>Contents</option></term> <listitem><para> Sets the Contents file output. (optional)</para></listitem> </varlistentry> - <varlistentry><term>BinOverride</term> + <varlistentry><term><option>BinOverride</option></term> <listitem><para> Sets the binary override file.</para></listitem> </varlistentry> - <varlistentry><term>SrcOverride</term> + <varlistentry><term><option>SrcOverride</option></term> <listitem><para> Sets the source override file.</para></listitem> </varlistentry> - <varlistentry><term>ExtraOverride</term> + <varlistentry><term><option>ExtraOverride</option></term> <listitem><para> Sets the binary extra override file.</para></listitem> </varlistentry> - <varlistentry><term>SrcExtraOverride</term> + <varlistentry><term><option>SrcExtraOverride</option></term> <listitem><para> Sets the source extra override file.</para></listitem> </varlistentry> - <varlistentry><term>BinCacheDB</term> + <varlistentry><term><option>BinCacheDB</option></term> <listitem><para> Sets the cache DB.</para></listitem> </varlistentry> - <varlistentry><term>PathPrefix</term> + <varlistentry><term><option>PathPrefix</option></term> <listitem><para> Appends a path to all the output paths.</para></listitem> </varlistentry> - <varlistentry><term>FileList, SourceFileList</term> + <varlistentry><term><option>FileList</option></term><term><option>SourceFileList</option></term> <listitem><para> Specifies the file list file.</para></listitem> </varlistentry> @@ -505,7 +505,7 @@ for i in Sections do &apt-cmdblurb; <variablelist> - <varlistentry><term><option>--md5</option>, <option>--sha1</option>, <option>--sha256</option></term> + <varlistentry><term><option>--md5</option></term><term><option>--sha1</option></term><term><option>--sha256</option></term> <listitem><para> Generate the given checksum. These options default to on, when turned off the generated index files will not have the checksum fields where possible. diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 15b9701e2..5cd5a5f8d 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -45,7 +45,7 @@ commands below must be present.</para> <variablelist> - <varlistentry><term>update</term> + <varlistentry><term><option>update</option></term> <listitem><para><literal>update</literal> is used to resynchronize the package index files from their sources. The indexes of available packages are fetched from the location(s) specified in <filename>/etc/apt/sources.list</filename>. @@ -57,7 +57,7 @@ of the package files cannot be known in advance.</para></listitem> </varlistentry> - <varlistentry><term>upgrade</term> + <varlistentry><term><option>upgrade</option></term> <listitem><para><literal>upgrade</literal> is used to install the newest versions of all packages currently installed on the system from the sources enumerated in <filename>/etc/apt/sources.list</filename>. Packages currently installed with @@ -70,7 +70,7 @@ available.</para></listitem> </varlistentry> - <varlistentry><term>dselect-upgrade</term> + <varlistentry><term><option>dselect-upgrade</option></term> <listitem><para><literal>dselect-upgrade</literal> is used in conjunction with the traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</literal> @@ -80,7 +80,7 @@ packages).</para></listitem> </varlistentry> - <varlistentry><term>dist-upgrade</term> + <varlistentry><term><option>dist-upgrade</option></term> <listitem><para><literal>dist-upgrade</literal> in addition to performing the function of <literal>upgrade</literal>, also intelligently handles changing dependencies with new versions of packages; <command>apt-get</command> has a "smart" conflict @@ -93,7 +93,7 @@ overriding the general settings for individual packages.</para></listitem> </varlistentry> - <varlistentry><term>install</term> + <varlistentry><term><option>install</option></term> <listitem> <para><literal>install</literal> is followed by one or more packages desired for installation or upgrading. @@ -147,7 +147,7 @@ with a '^' or '$' character, or create a more specific regular expression.</para></listitem> </varlistentry> - <varlistentry><term>remove</term> + <varlistentry><term><option>remove</option></term> <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are removed instead of installed. Note the removing a package leaves its configuration files in system. If a plus sign is appended to the package @@ -155,12 +155,12 @@ installed instead of removed.</para></listitem> </varlistentry> - <varlistentry><term>purge</term> + <varlistentry><term><option>purge</option></term> <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are removed and purged (any configuration files are deleted too).</para></listitem> </varlistentry> - <varlistentry><term>source</term> + <varlistentry><term><option>source</option></term> <listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT will examine the available packages to decide which source package to fetch. It will then find and download into the current directory the @@ -194,25 +194,25 @@ tar balls.</para></listitem> </varlistentry> - <varlistentry><term>build-dep</term> + <varlistentry><term><option>build-dep</option></term> <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an attempt to satisfy the build dependencies for a source package. By default the dependencies are satisfied to build the package natively. If desired a host-architecture can be specified with the <option>--host-architecture</option> option instead.</para></listitem> </varlistentry> - <varlistentry><term>check</term> + <varlistentry><term><option>check</option></term> <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks for broken dependencies.</para></listitem> </varlistentry> - <varlistentry><term>download</term> + <varlistentry><term><option>download</option></term> <listitem><para><literal>download</literal> will download the given binary package into the current directory. </para></listitem> </varlistentry> - <varlistentry><term>clean</term> + <varlistentry><term><option>clean</option></term> <listitem><para><literal>clean</literal> clears out the local repository of retrieved package files. It removes everything but the lock file from <filename>&cachedir;/archives/</filename> and @@ -222,7 +222,7 @@ from time to time to free up disk space.</para></listitem> </varlistentry> - <varlistentry><term>autoclean</term> + <varlistentry><term><option>autoclean</option></term> <listitem><para>Like <literal>clean</literal>, <literal>autoclean</literal> clears out the local repository of retrieved package files. The difference is that it only removes package files that can no longer be downloaded, and are largely @@ -232,17 +232,17 @@ erased if it is set to off.</para></listitem> </varlistentry> - <varlistentry><term>autoremove</term> + <varlistentry><term><option>autoremove</option></term> <listitem><para><literal>autoremove</literal> is used to remove packages that were automatically installed to satisfy dependencies for other packages and are now no longer needed.</para></listitem> </varlistentry> - <varlistentry><term>changelog</term> + <varlistentry><term><option>changelog</option></term> <listitem><para><literal>changelog</literal> downloads a package changelog and displays it through <command>sensible-pager</command>. The server name and base directory is defined in the <literal>APT::Changelogs::Server</literal> - variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for - Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for + variable (e. g. <ulink url="http://packages.debian.org/changelogs">packages.debian.org/changelogs</ulink> for + Debian or <ulink url="http://changelogs.ubuntu.com/changelogs">changelogs.ubuntu.com/changelogs</ulink> for Ubuntu). By default it displays the changelog for the version that is installed. However, you can specify the same options as for diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index a45ad8cd3..e5c8d5a2d 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -37,7 +37,7 @@ <refsect1><title>Commands - add &synopsis-param-filename; + Add a new key to the list of trusted keys. @@ -49,7 +49,7 @@ - del &synopsis-param-keyid; + @@ -60,7 +60,7 @@ - export &synopsis-param-keyid; + @@ -71,7 +71,7 @@ - exportall + @@ -82,7 +82,7 @@ - list + @@ -93,7 +93,7 @@ - finger + @@ -104,7 +104,7 @@ - adv + @@ -116,7 +116,7 @@ - update + @@ -130,7 +130,7 @@ - net-update + @@ -153,7 +153,7 @@ Options Note that options need to be defined before the commands described in the previous section. - --keyring &synopsis-param-filename; + With this option it is possible to specify a specific keyring file the command should operate on. The default is that a command is executed on the trusted.gpg file as well as on all parts in the diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index d62731124..f56115635 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -48,7 +48,7 @@ apt-get or aptitude. - auto + auto is used to mark a package as being automatically installed, which will cause the package to be removed when no more manually installed packages @@ -56,7 +56,7 @@ - manual + manual is used to mark a package as being manually installed, which will prevent the package from being automatically removed if no other packages @@ -64,7 +64,7 @@ - hold + hold is used to mark a package as hold back, which will prevent the package from being automatically installed, upgraded or removed. @@ -74,13 +74,13 @@ - unhold + unhold is used to cancel a previously set hold on a package to allow all actions again. - showauto + showauto is used to print a list of automatically installed packages with each package on a new line. All automatically installed packages will be listed if no package is given. @@ -88,14 +88,14 @@ - showmanual + showmanual can be used in the same way as showauto except that it will print a list of manually installed packages instead. - showhold + showhold is used to print a list of packages on hold in the same way as for the other show commands. @@ -109,12 +109,12 @@ - - + + - - Read/Write package stats from FILENAME - instead of the default location, which + Read/Write package stats from the filename given with the parameter + &synopsis-filename; + instead of from the default location, which is extended_status in the directory defined by the Configuration Item: Dir::State. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index ff9942e5f..b521db72c 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -148,13 +148,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; options for all of the tools. - Architecture + System Architecture; sets the architecture to use when fetching files and parsing package lists. The internal default is the architecture apt was compiled for. - Architectures + All Architectures the system supports. Processors implementing the amd64 (also called x86-64) instruction set are e.g. also able to execute binaries compiled for the i386 @@ -164,25 +164,25 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Default-Release + Default release to install packages from if more than one version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;. - Ignore-Hold + Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. - Clean-Installed + Defaults to on. When turned on the autoclean feature will remove any packages which can no longer be downloaded from the cache. If turned off then packages that are locally installed are also excluded from cleaning - but note that APT provides no direct means to reinstall them. - Immediate-Configure + Defaults to on which will cause APT to install essential and important packages as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing &dpkg; call: If this option is disabled APT does treat an important package in the same way as @@ -205,7 +205,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; improving or correcting the upgrade process. - Force-LoopBreak + Never Enable this option unless you -really- know what you are doing. It permits APT to temporarily remove an essential package to break a Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential @@ -214,7 +214,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; anything that those packages depend on. - Cache-Start, Cache-Grow and Cache-Limit + APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available' information. Cache-Start acts as a hint to which size the Cache will grow and is therefore the amount of memory APT will request at startup. The default value is @@ -230,21 +230,21 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Build-Essential + Defines which package(s) are considered essential build dependencies. - Get + The Get subsection controls the &apt-get; tool, please see its documentation for more information about the options here. - Cache + The Cache subsection controls the &apt-cache; tool, please see its documentation for more information about the options here. - CDROM + The CDROM subsection controls the &apt-cdrom; tool, please see its documentation for more information about the options here. @@ -256,7 +256,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. - Check-Valid-Until + Security related option defaulting to true as an expiring validation for a Release file prevents longtime replay attacks and can e.g. also help users to identify no longer updated mirrors - @@ -267,7 +267,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Max-ValidTime + Seconds the Release file should be considered valid after it was created (indicated by the Date header). If the Release file itself includes a Valid-Until header @@ -278,7 +278,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Min-ValidTime + Minimum of seconds the Release file should be considered valid after it was created (indicated by the Date header). Use this if you need to use a seldomly updated (local) mirror of a more @@ -289,7 +289,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - PDiffs + Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True by default. @@ -302,7 +302,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Queue-Mode + Queuing mode; Queue-Mode can be one of host or access which determines how APT parallelizes outgoing connections. host means that one connection per target host @@ -310,17 +310,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; will be opened. - Retries + Number of retries to perform. If this is non-zero APT will retry failed files the given number of times. - Source-Symlinks + Use symlinks for source archives. If set to true then source archives will be symlinked when possible instead of copying. True is the default. - http + HTTP URIs; http::Proxy is the default http proxy to use. It is in the standard form of http://[[user][:pass]@]host[:port]/. Per host proxies can also be specified by using the form @@ -363,7 +363,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - https + HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy options are the same as for http method and will also default to the options from the http method if they are not @@ -388,7 +388,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <host>::SslForceVersion is corresponding per-host option. - ftp + FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard form of ftp://[[user][:pass]@]host[:port]/. Per host proxies can also be specified by using the form @@ -427,7 +427,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; do not support RFC2428. - cdrom + CDROM URIs; the only setting for CDROM URIs is the mount point, cdrom::Mount which must be the mount point for the CDROM drive as specified in /etc/fstab. It is possible to provide @@ -438,13 +438,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; commands can be specified using UMount. - gpgv + GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv. gpgv::Options Additional options passed to gpgv. - CompressionTypes + List of compression types which are understood by the acquire methods. Files like Packages can be available in various compression formats. Per default the acquire methods can decompress bzip2, lzma @@ -472,7 +472,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; useable for local mirrors. - GzipIndexes + When downloading gzip compressed indexes (Packages, Sources, or Translations), keep them gzip compressed locally instead of unpacking @@ -481,7 +481,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Languages + The Languages subsection controls which Translation files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first available Description in the Language which is listed at first. Languages can be defined with their @@ -574,7 +574,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; control the default behaviour. These are in the DSelect section. - Clean + Cache Clean mode; this value may be one of always, prompt, auto, pre-auto and never. always and prompt will remove all packages from the cache after upgrading, prompt (the default) does so conditionally. @@ -583,17 +583,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; action before downloading new packages. - options + The contents of this variable is passed to &apt-get; as command line options when it is run for the install phase. - Updateoptions + The contents of this variable is passed to &apt-get; as command line options when it is run for the update phase. - PromptAfterUpdate + If true the [U]pdate operation in &dselect; will always prompt to continue. The default is to prompt only on error. @@ -605,20 +605,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; in the DPkg section. - options + This is a list of options to pass to dpkg. The options must be specified using the list notation and each list item is passed as a single argument to &dpkg;. - Pre-InvokePost-Invoke + This is a list of shell commands to run before/after invoking &dpkg;. Like options this must be specified in list notation. The commands are invoked in order using /bin/sh, should any fail APT will abort. - Pre-Install-Pkgs + This is a list of shell commands to run before invoking dpkg. Like options this must be specified in list notation. The commands are invoked in order using /bin/sh, should any fail APT @@ -632,12 +632,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; command given to Pre-Install-Pkgs. - Run-Directory + APT chdirs to this directory before invoking dpkg, the default is /. - Build-options + These options are passed to &dpkg-buildpackage; when compiling packages, the default is to disable signing and produce all binaries. @@ -665,7 +665,7 @@ DPkg::ConfigurePending "true"; DPkg::TriggersPending "true"; - DPkg::NoTriggers + Add the no triggers flag to all dpkg calls (except the ConfigurePending call). See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the triggers when this flag is present unless it is explicitly called to do so in an extra call. @@ -673,7 +673,7 @@ DPkg::TriggersPending "true"; meaning: Previously these option only append --no-triggers to the configure calls to dpkg - now apt will add these flag also to the unpack and remove calls. - PackageManager::Configure + Valid values are "all", "smart" and "no". "all" is the default value and causes APT to configure all packages explicit. The "smart" way is it to configure only packages which need to be configured before @@ -684,20 +684,20 @@ DPkg::TriggersPending "true"; default as otherwise the system could end in an unconfigured status which could be unbootable! - DPkg::ConfigurePending + If this option is set apt will call dpkg --configure --pending to let dpkg handle all required configurations and triggers. This option is activated automatic per default if the previous option is not set to all, but deactivating could be useful if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could deactivate this option in all but the last run. - DPkg::TriggersPending + Useful for smart configuration as a package which has pending triggers is not considered as installed and dpkg treats them as unpacked currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will process all triggers, not only the triggers needed to configure this package. - PackageManager::UnpackAll + As the configuration can be deferred to be done at the end by dpkg it can be tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true and therefore the "old" method of ordering in various steps by everything. While both method @@ -705,7 +705,7 @@ DPkg::TriggersPending "true"; this method is very experimental and needs further improvements before becoming really useful. - OrderList::Score::Immediate + Essential packages (and there dependencies) should be configured immediately after unpacking. It will be a good idea to do this quite early in the upgrade process as these these configure calls require currently also DPkg::TriggersPending which @@ -788,7 +788,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::cdrom + @@ -799,7 +799,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::ftp + @@ -810,7 +810,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::http + @@ -821,7 +821,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::https + @@ -832,7 +832,7 @@ DPkg::TriggersPending "true"; - Debug::Acquire::gpgv + @@ -843,7 +843,7 @@ DPkg::TriggersPending "true"; - Debug::aptcdrom + @@ -854,7 +854,7 @@ DPkg::TriggersPending "true"; - Debug::BuildDeps + Describes the process of resolving build-dependencies in @@ -864,7 +864,7 @@ DPkg::TriggersPending "true"; - Debug::Hashes + Output each cryptographic hash that is generated by the @@ -874,7 +874,7 @@ DPkg::TriggersPending "true"; - Debug::IdentCDROM + Do not include information from statfs, @@ -885,7 +885,7 @@ DPkg::TriggersPending "true"; - Debug::NoLocking + Disable all file locking. For instance, this will allow @@ -896,7 +896,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire + @@ -907,7 +907,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::Auth + Output status messages and errors related to verifying @@ -917,7 +917,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::Diffs + Output information about downloading and applying package @@ -928,7 +928,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::RRed + @@ -939,7 +939,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAcquire::Worker + @@ -950,7 +950,7 @@ DPkg::TriggersPending "true"; - Debug::pkgAutoRemove + @@ -961,7 +961,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDepCache::AutoInstall + Generate debug messages describing which packages are being @@ -975,7 +975,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDepCache::Marker + Generate debug messages describing which package is marked @@ -997,7 +997,7 @@ DPkg::TriggersPending "true"; - Debug::pkgInitConfig + Dump the default configuration to standard error on @@ -1007,7 +1007,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDPkgPM + When invoking &dpkg;, output the precise command line with @@ -1018,7 +1018,7 @@ DPkg::TriggersPending "true"; - Debug::pkgDPkgProgressReporting + Output all the data received from &dpkg; on the status file @@ -1028,7 +1028,7 @@ DPkg::TriggersPending "true"; - Debug::pkgOrderList + @@ -1040,7 +1040,7 @@ DPkg::TriggersPending "true"; - Debug::pkgPackageManager + @@ -1051,7 +1051,7 @@ DPkg::TriggersPending "true"; - Debug::pkgPolicy + @@ -1061,7 +1061,7 @@ DPkg::TriggersPending "true"; - Debug::pkgProblemResolver + @@ -1073,7 +1073,7 @@ DPkg::TriggersPending "true"; - Debug::pkgProblemResolver::ShowScores + Display a list of all installed packages with their calculated score @@ -1084,7 +1084,7 @@ DPkg::TriggersPending "true"; - Debug::sourceList + diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index f08f92b94..b6de039c6 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -287,6 +287,7 @@ Pin: release n=karmic* Pin-Priority: 990 + If a regular expression occurs in a Package 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 @@ -295,7 +296,7 @@ pins first, so later specific pins override it. The pattern "*" in a Package field is not considered a glob() expression in itself. - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index e7e198d5a..9500330b4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-05-20 18:22+0300\n" +"POT-Creation-Date: 2012-05-21 04:13+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -678,11 +678,6 @@ msgid "" "one of the commands below must be present." msgstr "" -#. type: Content of: -#: apt-cache.8.xml:48 -msgid "gencaches" -msgstr "" - #. type: Content of: #: apt-cache.8.xml:49 msgid "" @@ -690,9 +685,9 @@ msgid "" "implicitly by all commands needing this cache if it is missing or outdated." msgstr "" -#. type: Content of: -#: apt-cache.8.xml:53 -msgid "showpkg &synopsis-pkg;…" +#. type: Content of: